[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8333 - gnuradio/branches/releases/3.1/gr-wxgui/src/py
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r8333 - gnuradio/branches/releases/3.1/gr-wxgui/src/python |
Date: |
Thu, 8 May 2008 19:54:27 -0600 (MDT) |
Author: jcorgan
Date: 2008-05-08 19:54:27 -0600 (Thu, 08 May 2008)
New Revision: 8333
Modified:
gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py
Log:
Applied changeset r8274 on trunk to release branch.
Modified: gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py
===================================================================
--- gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py
2008-05-09 01:51:32 UTC (rev 8332)
+++ gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py
2008-05-09 01:54:27 UTC (rev 8333)
@@ -282,7 +282,6 @@
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 @@
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 @@
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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8333 - gnuradio/branches/releases/3.1/gr-wxgui/src/python,
jcorgan <=