[Commit-gnuradio] r6839 - in gnuradio/trunk: gr-utils/src/python gr-wxgui/src/python

[jcorgan]

Author: jcorgan
Date: 2007-11-08 13:50:47 -0700 (Thu, 08 Nov 2007)
New Revision: 6839

Modified:
   gnuradio/trunk/gr-utils/src/python/usrp_fft.py
   gnuradio/trunk/gr-wxgui/src/python/fftsink2.py
Log:
Fix for working with peak hold in usrp_fft.py

Modified: gnuradio/trunk/gr-utils/src/python/usrp_fft.py
===================================================================
--- gnuradio/trunk/gr-utils/src/python/usrp_fft.py      2007-11-08 20:25:32 UTC 
(rev 6838)
+++ gnuradio/trunk/gr-utils/src/python/usrp_fft.py      2007-11-08 20:50:47 UTC 
(rev 6839)
@@ -235,7 +235,7 @@
                 self.myform['baseband'].set_value(r.baseband_freq)
                 self.myform['ddc'].set_value(r.dxc_freq)
            if not self.options.waterfall and not self.options.oscilloscope:
-               self.scope.set_baseband_freq(target_freq)
+               self.scope.win.set_baseband_freq(target_freq)
            return True
 
         return False
@@ -264,9 +264,16 @@
        if event.CmdDown():
            # Re-center on maximum power
            points = self.scope.win._points
-            ind = numpy.argmax(points[:,1])
+           if self.scope.win.peak_hold:
+               if self.scope.win.peak_vals is not None:
+                   ind = numpy.argmax(self.scope.win.peak_vals)
+               else:
+                   ind = int(points.shape()[0]/2)
+           else:
+               ind = numpy.argmax(points[:,1])
             (freq, pwr) = points[ind]
            target_freq = freq/self.scope.win._scale_factor
+           print ind, freq, pwr
             self.set_freq(target_freq)            
        else:
            # Re-center on clicked frequency

Modified: gnuradio/trunk/gr-wxgui/src/python/fftsink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/fftsink2.py      2007-11-08 20:25:32 UTC 
(rev 6838)
+++ gnuradio/trunk/gr-wxgui/src/python/fftsink2.py      2007-11-08 20:50:47 UTC 
(rev 6839)
@@ -256,6 +256,8 @@
            self._format = "%3.3f"
 
     def set_baseband_freq(self, baseband_freq):
+       if self.peak_hold:
+           self.peak_vals = None
        self.set_scale(baseband_freq)
        self.fftsink.set_baseband_freq(baseband_freq)