diff options
| -rwxr-xr-x | gr-utils/src/python/usrp_fft.py | 11 | ||||
| -rwxr-xr-x | gr-wxgui/src/python/fftsink2.py | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gr-utils/src/python/usrp_fft.py b/gr-utils/src/python/usrp_fft.py index fae5ae4cd7..58da671472 100755 --- a/gr-utils/src/python/usrp_fft.py +++ b/gr-utils/src/python/usrp_fft.py @@ -235,7 +235,7 @@ class app_top_block(stdgui2.std_top_block): 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 @@ class app_top_block(stdgui2.std_top_block): 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 diff --git a/gr-wxgui/src/python/fftsink2.py b/gr-wxgui/src/python/fftsink2.py index 52b898a5d0..8e07dda410 100755 --- a/gr-wxgui/src/python/fftsink2.py +++ b/gr-wxgui/src/python/fftsink2.py @@ -256,6 +256,8 @@ class fft_window (plot.PlotCanvas): 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) |