Changeset 7282

Timestamp:

12/27/07 13:26:59

Author:

jcorgan

Message:

Applied changeset r6830 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py (modified) (3 diffs)

gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py

@@ -261 +261 @@
-            sf = 1e-9
-            self.units = "GHz"
+            self.format = "%3.6f"
-        elif x >= 1e6:
-            sf = 1e-6
-            self.units = "MHz"
+            self.format = "%3.3f"
-        else:
-            sf = 1e-3
-            self.units = "kHz"
+            self.format = "%3.3f"
-
-        if self.fftsink.input_is_real:     # only plot 1/2 the points
-            x_vals = ((numpy.arange (L/2)
- 
+
-                      + self.fftsink.baseband_freq * sf)
-            self.points = numpy.zeros((len(x_vals), 2), numpy.float64)
@@ -278 +281 @@
-            # the "negative freqs" are in the second half of the array
-            x_vals = ((numpy.arange (-L/2, L/2)
- 
+
-                      + self.fftsink.baseband_freq * sf)
-            self.points = numpy.zeros((len(x_vals), 2), numpy.float64)
@@ -365 +368 @@
-        x_val = x_vals[index]
-        db_val = self.points[index, 1]
-"%3.3f %s dB=%3.3f"
+(self.format+" %s dB=%3.3f")
-
-        # Display the tooltip