Changeset 8581

Timestamp:

06/11/08 18:29:56

Author:

jblum

Message:

fft sink gui with control panel

Files:

• gnuradio/trunk/gr-wxgui/src/python/fftsink2.py (modified) (12 diffs)

gnuradio/trunk/gr-wxgui/src/python/fftsink2.py

@@ -69 +69 @@
-        else:
-            self.avg.set_taps(1.0)
-       
-
+        
+
-    def set_peak_hold(self, enable):
-        self.peak_hold = enable
@@ -121 +121 @@
-        # FIXME  We need to add 3dB to all bins but the DC bin
-        self.log = gr.nlog10_ff(20, self.fft_size,
-           
-                              -10*math.log10(power/self.fft_size)      
-                              -20*math.log10(ref_scale/2))             
-                       
+                
+                               -10*math.log10(power/self.fft_size)        
+                               -20*math.log10(ref_scale/2))                
+                        
-        self.sink = gr.message_sink(gr.sizeof_float * self.fft_size, self.msgq, True)
-       
+        
-
-        self.win = fft_window(self, parent, size=size)
-        self.set_average(self.average)
-
+
-
-class fft_sink_c(gr.hier_block2, fft_sink_base):
@@ -164 +164 @@
-        # FIXME  We need to add 3dB to all bins but the DC bin
-        self.log = gr.nlog10_ff(20, self.fft_size,
-          
-                               -10*math.log10(power/self.fft_size)     
-                               -20*math.log10(ref_scale/2))            
-
+                
+                                -10*math.log10(power/self.fft_size)        
+                                -20*math.log10(ref_scale/2))                
+
-        self.sink = gr.message_sink(gr.sizeof_float * self.fft_size, self.msgq, True)
-       
+        
-
-        self.win = fft_window(self, parent, size=size)
-        self.set_average(self.average)
+        self.set_peak_hold(self.peak_hold)
-
-
@@ -219 +220 @@
-            wx.PostEvent (self.event_receiver, de)
-            del de
+
+class LabelText(wx.StaticText):
+    """Label text class for uniform labels among all controls."""
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def __init__ (self, fftsink, parent, id = -1,
-                  pos = wx.DefaultPosition, size = wx.DefaultSize,
-                  style = wx.DEFAULT_FRAME_STYLE, name = ""):
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        self.y_range = None
-        self.fftsink = fftsink
-        self.peak_hold = False
-        self.peak_vals = None
-        
-
+plot.
-        # self.SetEnableZoom (True)
-        # self.SetBackgroundColour ('black')
-        
-        self.build_popup_menu()
-       
-       
+        
+        
-        EVT_DATA_EVENT (self, self.set_data)
-        wx.EVT_CLOSE (self, self.on_close_window)
-
-
-
+plot.
+plot.
+
-        self.input_watcher = input_watcher(fftsink.msgq, fftsink.fft_size, self)
-
-    def set_scale(self, freq):
-
+
-        if x >= 1e9:
-            self._scale_factor = 1e-9
-            self._units = "GHz"
-       
+        
-        elif x >= 1e6:
-            self._scale_factor = 1e-6
-            self._units = "MHz"
-       
+        
-        else:
-            self._scale_factor = 1e-3
-            self._units = "kHz"
-       
+        
-
-    def set_baseband_freq(self, baseband_freq):
-       
-       
-       
-       
-
+        
+        
+        
+        
+
-    def on_close_window (self, event):
-        print "fft_window:on_close_window"
@@ -284 +352 @@
-        if self.fftsink.input_is_real:     # only plot 1/2 the points
-            x_vals = ((numpy.arange (L/2) * (self.fftsink.sample_rate 
-       
+        
-                      + self.fftsink.baseband_freq * self._scale_factor)
-            self._points = numpy.zeros((len(x_vals), 2), numpy.float64)
-            self._points[:,0] = x_vals
-            self._points[:,1] = dB[0:L/2]
-       
-               
-               
-               
+        
+                
+                
+                
-        else:
-            # the "negative freqs" are in the second half of the array
@@ -301 +369 @@
-            self._points[:,0] = x_vals
-            self._points[:,1] = numpy.concatenate ((dB[L/2:], dB[0:L/2]))
-       
-               
-               
-               
+        
+                
+                
+                
-
-        lines = [plot.PolyLine (self._points, colour='BLUE'),]
-       
-       
+        
+        
-
-        graphics = plot.PlotGraphics (lines,
@@ -314 +382 @@
-                                      xLabel = self._units, yLabel = "dB")
-
-
+plot.
-        self.update_y_range ()
-
@@ -325 +393 @@
-        ymax = self.fftsink.ref_level
-        ymin = self.fftsink.ref_level - self.fftsink.y_per_div * self.fftsink.y_divs
-
+plot.
-
-    def on_average(self, evt):
@@ -372 +440 @@
-            item = menu.FindItemById(id)
-            item.Check(pred())
-
+plot.
-
-    def evt_motion(self, event):
-        if not hasattr(self, "_points"):
-       
-       
-       
-
+        
+        
+        
+plot.
-        x_vals = numpy.array(self._points[:,0])
-        if ux < x_vals[0] or ux > x_vals[-1]:
@@ -411 +479 @@
-        self.id_average = wx.NewId()
-        self.id_peak_hold = wx.NewId()
-
-
-
-
-
-
-
-
-
-
-
-
+
+plot.
+plot.
+plot.
+plot.
+plot.
+plot.
+plot.
+plot.
+plot.
+plot.
+plot.
-        
-        # make a menu
@@ -500 +568 @@
-        vbox.Add (sink1.win, 1, wx.EXPAND)
-
-       
+        
-
-        #src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 2e3, 1)
@@ -510 +578 @@
-        vbox.Add (sink2.win, 1, wx.EXPAND)
-
-       
+        
-
-def main ():