[Commit-gnuradio] r8336 - gnuradio/branches/releases/3.1/gr-wxgui/src/python

[jcorgan]

Author: jcorgan
Date: 2008-05-08 19:57:00 -0600 (Thu, 08 May 2008)
New Revision: 8336

Modified:
   gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py
Log:
Applied changeset r8275 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:55:52 UTC (rev 8335)
+++ gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py      
2008-05-09 01:57:00 UTC (rev 8336)
@@ -66,14 +66,12 @@
         self.average = average
         if average:
             self.avg.set_taps(self.avg_alpha)
-            self.set_peak_hold(False)
         else:
             self.avg.set_taps(1.0)
-
+       self.win.peak_vals = None
+       
     def set_peak_hold(self, enable):
         self.peak_hold = enable
-        if enable:
-            self.set_average(False)
         self.win.set_peak_hold(enable)
 
     def set_avg_alpha(self, avg_alpha):