Changeset 8707

Timestamp:

06/25/08 14:12:06

Author:

jcorgan

Message:

Applied changesets r8581, r8584, r8585, and r8586 on trunk to release branch.

Files:

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

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

@@ -24 +24 @@
-from gnuradio.wxgui import stdgui2
-import wx
-gnuradio.wxgui.plot as 
+
-import numpy
-import threading
-import math    
+
+DIV_LEVELS = (1, 2, 5, 10, 20)
-
-default_fftsink_size = (640,240)
@@ -69 +71 @@
-        else:
-            self.avg.set_taps(1.0)
-       
-
+        
+
-    def set_peak_hold(self, enable):
-        self.peak_hold = enable
@@ -121 +123 @@
-        # 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 +166 @@
-        # 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 +222 @@
-            wx.PostEvent (self.event_receiver, de)
-            del de
+
+class control_panel(wx.Panel):
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def __init__ (self, fftsink, parent, id = -1,
-                  pos = wx.DefaultPosition, size = wx.DefaultSize,
-                  style = wx.DEFAULT_FRAME_STYLE, name = ""):
-
-
-
+
-        self.fftsink = fftsink
+        #init panel and plot 
+        wx.Panel.__init__(self, parent, -1)                  
+        self.plot = plot.PlotCanvas(self, id, pos, size, style, name)       
+        #setup the box with plot and controls
+        self.control_panel = control_panel(self)
+        main_box = wx.BoxSizer (wx.HORIZONTAL)
+        main_box.Add (self.plot, 1, wx.EXPAND)
+        main_box.Add (self.control_panel, 0, wx.EXPAND)
+        self.SetSizerAndFit(main_box)
+        
-        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 +367 @@
-        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 +384 @@
-            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,
-                                      title=self.fftsink.title,
-                                      xLabel = self._units, yLabel = "dB")
-
-
-
-
+
+
+
+
+
-
-    def set_peak_hold(self, enable):
@@ -322 +406 @@
-        self.peak_vals = None
-
-    def update_y_range (self):
-        ymax = self.fftsink.ref_level
-        ymin = self.fftsink.ref_level - self.fftsink.y_per_div * self.fftsink.y_divs
-        self.y_range = self._axisInterval ('min', ymin, ymax)
-
-    def on_average(self, evt):
-        # print "on_average"
-        self.fftsink.set_average(evt.IsChecked())
+        self.control_panel.update()
-
-    def on_peak_hold(self, evt):
-        # print "on_peak_hold"
-        self.fftsink.set_peak_hold(evt.IsChecked())
+        self.control_panel.update()
-
-    def on_incr_ref_level(self, evt):
@@ -347 +428 @@
-    def on_incr_y_per_div(self, evt):
-        # print "on_incr_y_per_div"
-
+
+
-
-    def on_decr_y_per_div(self, evt):
-        # print "on_decr_y_per_div"
-
+
+
-
-    def on_y_per_div(self, evt):
@@ -366 +449 @@
-        elif Id == self.id_y_per_div_20:
-            self.fftsink.set_y_per_div(20)
+        self.control_panel.update()
-
-    def on_right_click(self, event):
@@ -372 +456 @@
-            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 +495 @@
-        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
@@ -497 +581 @@
-        sink1 = fft_sink_c (panel, title="Complex Data", fft_size=fft_size,
-                            sample_rate=input_rate, baseband_freq=100e3,
-
+, y_divs=10
-        vbox.Add (sink1.win, 1, wx.EXPAND)
-
-       
+        
-
-        #src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 2e3, 1)
@@ -507 +591 @@
-        sink2 = fft_sink_f (panel, title="Real Data", fft_size=fft_size*2,
-                            sample_rate=input_rate, baseband_freq=100e3,
-
+, y_divs=10
-        vbox.Add (sink2.win, 1, wx.EXPAND)
-
-       
+        
-
-def main ():

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

@@ -768 +768 @@
-        return self._xUseScopeTicks
-
-
+, step=None
-        """Draw objects in graphics with specified x and y axis.
-        graphics- instance of PlotGraphics with list of PolyXXX objects
@@ -830 +830 @@
-            xTextExtent= (0,0) # No text for ticks
-        if self._ySpec is not 'none':
-
+, step
-            yTextExtentBottom= dc.GetTextExtent(yticks[0][1])
-            yTextExtentTop   = dc.GetTextExtent(yticks[-1][1])
@@ -1278 +1278 @@
-                text = 0    # axis values not drawn on right side
-
-
+, step=None
-        ideal = (upper-lower)/7.
-        log = _numpy.log10(ideal)
@@ -1299 +1299 @@
-            digits = -int(power)
-            format = '%'+`digits+2`+'.'+`digits`+'f'
+        #force grid when step is not None
+        if step is not None: grid = step
-        ticks = []
-        t = -grid*_numpy.floor(-lower/grid)
-        while t <= upper:
+            if t == -0: t = 0 #remove neg zero condition
-            ticks.append( (t, format % (t,)) )
-            t = t + grid