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

[jcorgan]

Author: jcorgan
Date: 2008-02-28 19:28:01 -0700 (Thu, 28 Feb 2008)
New Revision: 7885

Modified:
   gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py
Log:
Applied changeset r7871 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-02-29 02:11:39 UTC (rev 7884)
+++ gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py      
2008-02-29 02:28:01 UTC (rev 7885)
@@ -91,7 +91,7 @@
         
 
 class fft_sink_f(gr.hier_block2, fft_sink_base):
-    def __init__(self, parent, baseband_freq=0, ref_scale=1.0,
+    def __init__(self, parent, baseband_freq=0, ref_scale=2.0,
                  y_per_div=10, y_divs=8, ref_level=50, sample_rate=1, 
fft_size=512,
                  fft_rate=default_fft_rate, average=False, avg_alpha=None,
                  title='', size=default_fftsink_size, peak_hold=False):
@@ -124,7 +124,7 @@
         self.log = gr.nlog10_ff(20, self.fft_size,
                                -20*math.log10(self.fft_size)           # 
Adjust for number of bins
                               -10*math.log10(power/self.fft_size)      # 
Adjust for windowing loss
-                              -20*math.log10(ref_scale))               # 
Adjust for reference scale
+                              -20*math.log10(ref_scale/2))             # 
Adjust for reference scale
                               
         self.sink = gr.message_sink(gr.sizeof_float * self.fft_size, 
self.msgq, True)
        self.connect(self, self.s2p, self.one_in_n, self.fft, self.c2mag, 
self.avg, self.log, self.sink)
@@ -134,7 +134,7 @@
 
 
 class fft_sink_c(gr.hier_block2, fft_sink_base):
-    def __init__(self, parent, baseband_freq=0, ref_scale=1.0,
+    def __init__(self, parent, baseband_freq=0, ref_scale=2.0,
                  y_per_div=10, y_divs=8, ref_level=50, sample_rate=1, 
fft_size=512,
                  fft_rate=default_fft_rate, average=False, avg_alpha=None,
                  title='', size=default_fftsink_size, peak_hold=False):
@@ -167,7 +167,7 @@
         self.log = gr.nlog10_ff(20, self.fft_size,
                                 -20*math.log10(self.fft_size)          # 
Adjust for number of bins
                                -10*math.log10(power/self.fft_size)     # 
Adjust for windowing loss
-                               -20*math.log10(ref_scale))              # 
Adjust for reference scale
+                               -20*math.log10(ref_scale/2))            # 
Adjust for reference scale
                                
         self.sink = gr.message_sink(gr.sizeof_float * self.fft_size, 
self.msgq, True)
        self.connect(self, self.s2p, self.one_in_n, self.fft, self.c2mag, 
self.avg, self.log, self.sink)