[Commit-gnuradio] r9264 - in gnuradio/branches/developers/jblum/glwxgui: gnuradio-core/src/python/gnuradio/blks2impl gr-wxgui/src/python

[jblum]

Author: jblum
Date: 2008-08-12 21:07:06 -0600 (Tue, 12 Aug 2008)
New Revision: 9264

Modified:
   
gnuradio/branches/developers/jblum/glwxgui/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py
   
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scope_window.py
   
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink_gl.py
   
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink_gl.py
Log:
set vec rate, scope window construtor change

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py
===================================================================
--- 
gnuradio/branches/developers/jblum/glwxgui/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py
 2008-08-12 23:37:57 UTC (rev 9263)
+++ 
gnuradio/branches/developers/jblum/glwxgui/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py
 2008-08-13 03:07:06 UTC (rev 9264)
@@ -72,6 +72,13 @@
         """
         self._sd.set_decimation(decim)
 
+    def set_vec_rate(self, vec_rate):
+        """!
+        Set the vector rate on stream decimator.
+        @param vec_rate the new vector rate
+        """
+        self._sd.set_vec_rate(vec_rate)
+
     def set_sample_rate(self, sample_rate):
         """!
         Set the new sampling rate

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scope_window.py
===================================================================
--- 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scope_window.py  
    2008-08-12 23:37:57 UTC (rev 9263)
+++ 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scope_window.py  
    2008-08-13 03:07:06 UTC (rev 9264)
@@ -245,8 +245,8 @@
                frame_rate,
                num_inputs,
                sample_rate_key,
-               x_per_div,
-               y_per_div,
+               t_scale,
+               v_scale,
                ac_couple,
                xy_mode,
                scope_trigger_level_key,
@@ -262,9 +262,9 @@
                self.ext_controller = controller
                self.num_inputs = num_inputs
                self.sample_rate_key = sample_rate_key
-               autorange = y_per_div is None
+               autorange = v_scale is None
                self.autorange_ts = 0
-               if y_per_div is None: y_per_div = 1
+               if v_scale is None: v_scale = 1
                self.frame_counter = 0
                self._init = False #HACK
                #scope keys
@@ -290,9 +290,9 @@
                self._register_set_prop(self, AC_COUPLE_KEY, ac_couple)
                self._register_set_prop(self, SCOPE_XY_MODE_KEY, xy_mode)
                self._register_set_prop(self, AUTORANGE_KEY, autorange)
-               self._register_set_prop(self, T_PER_DIV_KEY, x_per_div)
-               self._register_set_prop(self, X_PER_DIV_KEY, y_per_div)
-               self._register_set_prop(self, Y_PER_DIV_KEY, y_per_div)
+               self._register_set_prop(self, T_PER_DIV_KEY, t_scale)
+               self._register_set_prop(self, X_PER_DIV_KEY, v_scale)
+               self._register_set_prop(self, Y_PER_DIV_KEY, v_scale)
                self._register_set_prop(self, T_OFF_KEY, 0)
                self._register_set_prop(self, X_OFF_KEY, 0)
                self._register_set_prop(self, Y_OFF_KEY, 0)

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink_gl.py
===================================================================
--- 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink_gl.py  
    2008-08-12 23:37:57 UTC (rev 9263)
+++ 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink_gl.py  
    2008-08-13 03:07:06 UTC (rev 9264)
@@ -102,8 +102,8 @@
                        frame_rate=frame_rate,
                        num_inputs=num_inputs,
                        sample_rate_key=SAMPLE_RATE_KEY,
-                       x_per_div=t_scale,
-                       y_per_div=v_scale,
+                       t_scale=t_scale,
+                       v_scale=v_scale,
                        ac_couple=ac_couple,
                        xy_mode=xy_mode,
                        scope_trigger_level_key=SCOPE_TRIGGER_LEVEL_KEY,

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink_gl.py
===================================================================
--- 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink_gl.py
  2008-08-12 23:37:57 UTC (rev 9263)
+++ 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink_gl.py
  2008-08-13 03:07:06 UTC (rev 9264)
@@ -85,7 +85,7 @@
                self.controller.publish(SAMPLE_RATE_KEY, fft.sample_rate)
                self.controller.subscribe(DECIMATION_KEY, fft.set_decimation)
                self.controller.publish(DECIMATION_KEY, fft.decimation)
-               self.controller.subscribe(FRAME_RATE_KEY, fft._sd.set_vec_rate)
+               self.controller.subscribe(FRAME_RATE_KEY, fft.set_vec_rate)
                self.controller.publish(FRAME_RATE_KEY, fft.frame_rate)
                #start input watcher
                def setter(p, k, x): # lambdas can't have assignments :(