Changeset 4655

Timestamp:

08/10/07 14:35:28 (6 years ago)

Author:

DrewCormier

Message:

now you can hit ENTER instead of pressing the button

Files:

• experimental/components/USRP_Commander_GUI/branches/0.6.2/USRP_Commander_GUI/USRP_Commander_GUI.py (modified) (11 diffs)

experimental/components/USRP_Commander_GUI/branches/0.6.2/USRP_Commander_GUI/USRP_Commander_GUI.py

@@ -358 +358 @@
                                         name=u'rxGainEditor', 
                                         pos=editor_pos[0],
-                                        size=editor_size, style=0, 
+                                        size=editor_size, 
+                                        style=wx.TE_PROCESS_ENTER, 
                                         value=u'')
+        self.rxGainEditor.Bind(wx.EVT_TEXT_ENTER, self.OnSetRxGain, id=-1)
         self.SetRxGainBtn = wx.Button(self.splitterWindow1, -1, 
                                       label='Set Rx Gain',
@@ -367 +369 @@
         self.SetRxGainBtn.SetFont(wx.Font(14, wx.SWISS, wx.NORMAL, 
                                           wx.BOLD, False))
-        self.SetRxGainBtn.Bind(wx.EVT_BUTTON, self.OnSetRxGainBtnButton,id=-1)
+        self.SetRxGainBtn.Bind(wx.EVT_BUTTON, self.OnSetRxGain,id=-1)
 
 
@@ -404 +406 @@
                                         name=u'txFreqEditor', 
                                         pos=editor_pos[2],
-                                        size=editor_size, style=0, 
+                                        size=editor_size,
+                                        style=wx.TE_PROCESS_ENTER, 
                                         value=u'')
+        self.txFreqEditor.Bind(wx.EVT_TEXT_ENTER, self.OnSetTxFreq, id=-1)
         self.SetTxFreqBtn = wx.Button(self.splitterWindow1, -1, 
                                       label='Set Tx Freq',
@@ -413 +417 @@
         self.SetTxFreqBtn.SetFont(wx.Font(14, wx.SWISS, 
                                           wx.NORMAL, wx.BOLD, False))
-        self.SetTxFreqBtn.Bind(wx.EVT_BUTTON, self.OnSetTxFreqBtnButton,id=-1)
+        self.SetTxFreqBtn.Bind(wx.EVT_BUTTON, self.OnSetTxFreq,id=-1)
 
         # Rx decimation controls:
@@ -419 +423 @@
                                            name=u'rxDecRateEditor', 
                                            pos=editor_pos[3],
-                                           size=editor_size, style=0, 
+                                           size=editor_size, 
+                                           style=wx.TE_PROCESS_ENTER, 
                                            value=u'')
+        self.txDecRateEditor.Bind(wx.EVT_TEXT_ENTER, 
+                                  self.OnSetRxDecRate, id=-1)
         self.SetRxDecRateBtn = wx.Button(self.splitterWindow1, -1, 
                                          label='Set Rx Decimation Rate',
@@ -429 +436 @@
                                              wx.NORMAL, wx.BOLD, False))
         self.SetRxDecRateBtn.Bind(wx.EVT_BUTTON, 
-                                  self.OnSetRxDecRateBtnButton, id=-1)
+                                  self.OnSetRxDecRate, id=-1)
 
         # Rx packet size controls:
@@ -435 +442 @@
                                               name=u'rxPacketSizeEditor', 
                                               pos=editor_pos[4],
-                                              size=editor_size, style=0, 
+                                              size=editor_size, 
+                                              style=wx.TE_PROCESS_ENTER, 
                                               value=u'')
+        self.rxPacketSizeEditor.Bind(wx.EVT_TEXT_ENTER, 
+                                     self.OnSetRxPacketSize, id=-1)
         self.SetRxPacketSizeBtn = wx.Button(self.splitterWindow1, -1, 
                                             label='Set Rx Packet Size',
@@ -445 +455 @@
                                                 wx.NORMAL, wx.BOLD, False))
         self.SetRxPacketSizeBtn.Bind(wx.EVT_BUTTON, 
-                                     self.OnSetRxPacketSizeBtnButton,
-                                     id=-1)
-
-
-    def OnSetRxGainBtnButton(self,event):
+                                     self.OnSetRxPacketSize, id=-1)
+
+
+    def OnSetRxGain(self,event):
         rx_gain = int(self.rxGainEditor.GetLineText(0))        
 
@@ -467 +476 @@
         event.Skip()
 
-    def OnSetTxFreqBtnButton(self,event):
+    def OnSetTxFreq(self,event):
         tx_freq = float(self.txFreqEditor.GetLineText(0))
         tx_freq = int(rx_freq * 1000000)    # convert to MHz        
@@ -476 +485 @@
         event.Skip()
 
-    def OnSetRxDecRateBtnButton(self,event):
+    def OnSetRxDecRate(self,event):
         dec_rate = int(self.rxDecRateEditor.GetLineText(0))        
         
@@ -485 +494 @@
         event.Skip()
 
-    def OnSetRxPacketSizeBtnButton(self,event):
+    def OnSetRxPacketSize(self,event):
         pack_size = int(self.rxPacketSizeEditor.GetLineText(0))