[Commit-gnuradio] r9198 - gnuradio/branches/features/experimental-gui

[jblum]

Author: jblum
Date: 2008-08-06 16:54:52 -0600 (Wed, 06 Aug 2008)
New Revision: 9198

Modified:
   gnuradio/branches/features/experimental-gui/common.py
   gnuradio/branches/features/experimental-gui/scope_window.py
   gnuradio/branches/features/experimental-gui/scopesink.py
Log:
drop in replacement: scope, fft, waterfall

Modified: gnuradio/branches/features/experimental-gui/common.py
===================================================================
--- gnuradio/branches/features/experimental-gui/common.py       2008-08-06 
22:11:43 UTC (rev 9197)
+++ gnuradio/branches/features/experimental-gui/common.py       2008-08-06 
22:54:52 UTC (rev 9198)
@@ -209,8 +209,8 @@
        @param num the number
        @return the next higher number
        """
+       num = get_clean_num(num)
        exp = get_exp(num)
-       num = get_clean_num(num)
        base = int(num/10**exp)
        return {
                1: 2,
@@ -224,8 +224,8 @@
        @param num the number
        @return the next lower number
        """
+       num = get_clean_num(num)
        exp = get_exp(num)
-       num = get_clean_num(num)
        base = int(num/10**exp)
        return {
                1: .5,

Modified: gnuradio/branches/features/experimental-gui/scope_window.py
===================================================================
--- gnuradio/branches/features/experimental-gui/scope_window.py 2008-08-06 
22:11:43 UTC (rev 9197)
+++ gnuradio/branches/features/experimental-gui/scope_window.py 2008-08-06 
22:54:52 UTC (rev 9198)
@@ -277,8 +277,8 @@
                        #autorange
                        if self[AUTORANGE_KEY] and time.time() - 
self.autorange_ts > AUTORANGE_UPDATE_RATE:
                                bounds = [common.get_min_max(samples) for 
samples in sampleses]
-                               y_min = min(*[bound[0] for bound in bounds])
-                               y_max = max(*[bound[1] for bound in bounds])
+                               y_min = numpy.min(*[bound[0] for bound in 
bounds])
+                               y_max = numpy.max(*[bound[1] for bound in 
bounds])
                                #adjust the y per div
                                y_per_div = 
common.get_clean_num((y_max-y_min)/self[Y_DIVS_KEY])
                                if y_per_div != self[Y_PER_DIV_KEY]: 
self.set_y_per_div(y_per_div)

Modified: gnuradio/branches/features/experimental-gui/scopesink.py
===================================================================
--- gnuradio/branches/features/experimental-gui/scopesink.py    2008-08-06 
22:11:43 UTC (rev 9197)
+++ gnuradio/branches/features/experimental-gui/scopesink.py    2008-08-06 
22:54:52 UTC (rev 9198)
@@ -58,6 +58,7 @@
                ac_couple=False,
                frame_rate=scope_window.DEFAULT_FRAME_RATE,
        ):
+               if t_scale is None: t_scale = 0.001
                #init
                gr.hier_block2.__init__(
                        self,
@@ -78,6 +79,7 @@
                                self.connect((self, i), c2f)
                                self.connect((c2f, 0), (scope, 2*i+0))
                                self.connect((c2f, 1), (scope, 2*i+1))
+                       num_inputs *= 2
                #controller
                self.controller = pubsub()
                self.controller.subscribe(SAMPLE_RATE_KEY, 
scope.set_sample_rate)