[Commit-gnuradio] gnuradio-examples ChangeLog python/usrp/usrp_ff...

[Eric Blossom]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-examples
Changes by:     Eric Blossom <eb>       06/06/16 06:35:44

Modified files:
        .              : ChangeLog 
        python/usrp    : usrp_fft.py usrp_oscope.py 

Log message:
        decimation rate is now settable in the GUI

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-examples/ChangeLog?cvsroot=gnuradio&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnuradio-examples/python/usrp/usrp_fft.py?cvsroot=gnuradio&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnuradio-examples/python/usrp/usrp_oscope.py?cvsroot=gnuradio&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gnuradio-examples/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- ChangeLog   11 Jun 2006 15:52:20 -0000      1.62
+++ ChangeLog   16 Jun 2006 06:35:43 -0000      1.63
@@ -1,6 +1,7 @@
-2006-06-11  Eric Blossom  <address@hidden>
+2006-06-15  Eric Blossom  <address@hidden>
 
-       * python/gmsk2/mpsk.py: comment change to test commit-notification
+       * python/usrp/usrp_oscope.py, python/usrp/usrp_fft.py: you can now
+       change the decimation factor in the GUI.
 
 2006-06-06  Eric Blossom  <address@hidden>
 

Index: python/usrp/usrp_fft.py
===================================================================
RCS file: /sources/gnuradio/gnuradio-examples/python/usrp/usrp_fft.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- python/usrp/usrp_fft.py     6 Apr 2006 21:00:14 -0000       1.24
+++ python/usrp/usrp_fft.py     16 Jun 2006 06:35:43 -0000      1.25
@@ -165,6 +165,9 @@
         # FIXME figure out how to have this be a subpanel that is always
         # created, but has its visibility controlled by foo.Show(True/False)
         
+        def _form_set_decim(kv):
+            return self.set_decim(kv['decim'])
+
         if not(self.show_debug_info):
             return
 
@@ -177,8 +180,10 @@
 
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         hbox.Add((5,0), 0)
-        myform['decim'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Decim")
+
+        myform['decim'] = form.int_field(
+            parent=panel, sizer=hbox, label="Decim",
+            callback=myform.check_input_and_call(_form_set_decim, 
self._set_status_msg))
 
         hbox.Add((5,0), 1)
         myform['address@hidden'] = form.static_float_field(
@@ -200,7 +205,6 @@
         vbox.Add(hbox, 0, wx.EXPAND)
 
         
-        
     def set_freq(self, target_freq):
         """
         Set the center frequency we're interested in.
@@ -228,6 +232,16 @@
         self.myform['gain'].set_value(gain)     # update displayed value
         self.subdev.set_gain(gain)
 
+    def set_decim(self, decim):
+        ok = self.u.set_decim_rate(decim)
+        if not ok:
+            print "set_decim failed"
+        input_rate = self.u.adc_freq() / self.u.decim_rate()
+        self.scope.set_sample_rate(input_rate)
+        if self.show_debug_info:  # update displayed values
+            self.myform['decim'].set_value(self.u.decim_rate())
+            self.myform['address@hidden'].set_value(self.u.adc_freq() / 
self.u.decim_rate())
+
 
 def main ():
     app = stdgui.stdapp(app_flow_graph, "USRP FFT", nstatus=1)

Index: python/usrp/usrp_oscope.py
===================================================================
RCS file: /sources/gnuradio/gnuradio-examples/python/usrp/usrp_oscope.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- python/usrp/usrp_oscope.py  13 Mar 2006 01:11:49 -0000      1.13
+++ python/usrp/usrp_oscope.py  16 Jun 2006 06:35:43 -0000      1.14
@@ -166,6 +166,9 @@
         # FIXME figure out how to have this be a subpanel that is always
         # created, but has its visibility controlled by foo.Show(True/False)
         
+        def _form_set_decim(kv):
+            return self.set_decim(kv['decim'])
+
         if not(self.show_debug_info):
             return
 
@@ -178,8 +181,10 @@
 
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         hbox.Add((5,0), 0)
-        myform['decim'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Decim")
+
+        myform['decim'] = form.int_field(
+            parent=panel, sizer=hbox, label="Decim",
+            callback=myform.check_input_and_call(_form_set_decim, 
self._set_status_msg))
 
         hbox.Add((5,0), 1)
         myform['address@hidden'] = form.static_float_field(
@@ -201,7 +206,6 @@
         vbox.Add(hbox, 0, wx.EXPAND)
 
         
-        
     def set_freq(self, target_freq):
         """
         Set the center frequency we're interested in.
@@ -229,6 +233,16 @@
         self.myform['gain'].set_value(gain)     # update displayed value
         self.subdev.set_gain(gain)
 
+    def set_decim(self, decim):
+        ok = self.u.set_decim_rate(decim)
+        if not ok:
+            print "set_decim failed"
+        input_rate = self.u.adc_freq() / self.u.decim_rate()
+        self.scope.set_sample_rate(input_rate)
+        if self.show_debug_info:  # update displayed values
+            self.myform['decim'].set_value(self.u.decim_rate())
+            self.myform['address@hidden'].set_value(self.u.adc_freq() / 
self.u.decim_rate())
+        return ok
 
 def main ():
     app = stdgui.stdapp(app_flow_graph, "USRP O'scope", nstatus=1)