diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-04-24 23:02:55 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-04-24 23:02:55 +0000 |
| commit | 1959159927243a585342d1be5e7b70d56ab2984b (patch) | |
| tree | af9a80d1ff9f3b6a8d10ab15c76fb55f56e557b1 /gr-wxgui/src/python/fftsink2.py | |
| parent | b92c457af141ed992671d14bf0a1b269b4946f8d (diff) | |
Changed fftsink2 peak hold to be concurrent with live trace.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8274 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-wxgui/src/python/fftsink2.py')
| -rwxr-xr-x | gr-wxgui/src/python/fftsink2.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gr-wxgui/src/python/fftsink2.py b/gr-wxgui/src/python/fftsink2.py index 3bfb8afbd5..9945293ec9 100755 --- a/gr-wxgui/src/python/fftsink2.py +++ b/gr-wxgui/src/python/fftsink2.py @@ -282,7 +282,6 @@ class fft_window (plot.PlotCanvas): self.peak_vals = dB else: self.peak_vals = numpy.maximum(dB, self.peak_vals) - dB = self.peak_vals if self.fftsink.input_is_real: # only plot 1/2 the points x_vals = ((numpy.arange (L/2) * (self.fftsink.sample_rate @@ -291,6 +290,10 @@ class fft_window (plot.PlotCanvas): self._points = numpy.zeros((len(x_vals), 2), numpy.float64) self._points[:,0] = x_vals self._points[:,1] = dB[0:L/2] + if self.peak_hold: + self._peak_points = numpy.zeros((len(x_vals), 2), numpy.float64) + self._peak_points[:,0] = x_vals + self._peak_points[:,1] = self.peak_vals[0:L/2] else: # the "negative freqs" are in the second half of the array x_vals = ((numpy.arange (-L/2, L/2) @@ -299,9 +302,16 @@ class fft_window (plot.PlotCanvas): self._points = numpy.zeros((len(x_vals), 2), numpy.float64) self._points[:,0] = x_vals self._points[:,1] = numpy.concatenate ((dB[L/2:], dB[0:L/2])) + if self.peak_hold: + self._peak_points = numpy.zeros((len(x_vals), 2), numpy.float64) + self._peak_points[:,0] = x_vals + self._peak_points[:,1] = numpy.concatenate ((self.peak_vals[L/2:], self.peak_vals[0:L/2])) - lines = plot.PolyLine (self._points, colour='BLUE') - graphics = plot.PlotGraphics ([lines], + lines = [plot.PolyLine (self._points, colour='BLUE'),] + if self.peak_hold: + lines.append(plot.PolyLine (self._peak_points, colour='GREEN')) + + graphics = plot.PlotGraphics (lines, title=self.fftsink.title, xLabel = self._units, yLabel = "dB") |