From f5fb7e9d9df913eb8ca23c47b6b9aa117656971f Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 20 Mar 2013 10:48:05 -0400
Subject: wxgui: fixing up some sloppiness after merge from master.
---
gr-wxgui/python/fftsink_nongl.py | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
(limited to 'gr-wxgui/python')
diff --git a/gr-wxgui/python/fftsink_nongl.py b/gr-wxgui/python/fftsink_nongl.py
index c65fc07ae4..57eb2840cd 100644
--- a/gr-wxgui/python/fftsink_nongl.py
+++ b/gr-wxgui/python/fftsink_nongl.py
@@ -21,7 +21,7 @@
#
from gnuradio import gr, gru, fft
-+import gnuradio.filter as grfilter
+import gnuradio.filter as grfilter
from gnuradio import blocks
from gnuradio import analog
from gnuradio.wxgui import stdgui2
@@ -41,7 +41,8 @@ class fft_sink_base(object):
y_divs=8, ref_level=50,
sample_rate=1, fft_size=512,
fft_rate=default_fft_rate,
- average=False, avg_alpha=None, title='', peak_hold=False,use_persistence=False,persist_alpha=0.2):
+ average=False, avg_alpha=None, title='',
+ peak_hold=False, use_persistence=False, persist_alpha=0.2):
# initialize common attributes
self.baseband_freq = baseband_freq
@@ -110,7 +111,8 @@ class fft_sink_f(gr.hier_block2, fft_sink_base):
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, use_persistence=False,persist_alpha=0.2, **kwargs):
+ title='', size=default_fftsink_size, peak_hold=False,
+ use_persistence=False, persist_alpha=0.2, **kwargs):
gr.hier_block2.__init__(self, "fft_sink_f",
gr.io_signature(1, 1, gr.sizeof_float),
@@ -121,7 +123,8 @@ class fft_sink_f(gr.hier_block2, fft_sink_base):
sample_rate=sample_rate, fft_size=fft_size,
fft_rate=fft_rate,
average=average, avg_alpha=avg_alpha, title=title,
- peak_hold=peak_hold,use_persistence=use_persistence,persist_alpha=persist_alpha)
+ peak_hold=peak_hold, use_persistence=use_persistence,
+ persist_alpha=persist_alpha)
self.s2p = blocks.stream_to_vector(gr.sizeof_float, self.fft_size)
self.one_in_n = blocks.keep_one_in_n(gr.sizeof_float * self.fft_size,
@@ -167,7 +170,8 @@ class fft_sink_c(gr.hier_block2, fft_sink_base):
sample_rate=sample_rate, fft_size=fft_size,
fft_rate=fft_rate,
average=average, avg_alpha=avg_alpha, title=title,
- peak_hold=peak_hold, use_persistence=use_persistence,persist_alpha=persist_alpha)
+ peak_hold=peak_hold, use_persistence=use_persistence,
+ persist_alpha=persist_alpha)
self.s2p = blocks.stream_to_vector(gr.sizeof_gr_complex, self.fft_size)
self.one_in_n = blocks.keep_one_in_n(gr.sizeof_gr_complex * self.fft_size,
@@ -611,15 +615,10 @@ class test_app_block (stdgui2.std_top_block):
input_rate = 100*20.48e3
# Generate a complex sinusoid
-<<<<<<< HEAD:gr-wxgui/python/fftsink_nongl.py
- #src1 = analog.sig_source_c(input_rate, analog.GR_SIN_WAVE, 100*2e3, 1)
- src1 = analog.sig_source_c(input_rate, analog.GR_CONST_WAVE, 100*5.75e3, 1)
-=======
#src1 = gr.sig_source_c (input_rate, gr.GR_SIN_WAVE, 100*2e3, 1)
src1 = gr.sig_source_c (input_rate, gr.GR_CONST_WAVE, 100*5.75e3, 1)
noise1 = analog.noise_source_c(analog.GR_UNIFORM, 1.0/10)
add1 = blocks.add_cc()
->>>>>>> master:gr-wxgui/src/python/fftsink_nongl.py
# We add these throttle blocks so that this demo doesn't
# suck down all the CPU available. Normally you wouldn't use these.
@@ -634,15 +633,6 @@ class test_app_block (stdgui2.std_top_block):
self.connect(noise1, (add1,1))
self.connect(add1, thr1, sink1)
-<<<<<<< HEAD:gr-wxgui/python/fftsink_nongl.py
- #src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 100*2e3, 1)
- src2 = analog.sig_source_f(input_rate, analog.GR_CONST_WAVE, 100*5.75e3, 1)
- thr2 = blocks.throttle(gr.sizeof_float, input_rate)
- sink2 = fft_sink_f(panel, title="Real Data", fft_size=fft_size*2,
- sample_rate=input_rate, baseband_freq=100e3,
- ref_level=0, y_per_div=20, y_divs=10)
- vbox.Add(sink2.win, 1, wx.EXPAND)
-=======
#src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 100*2e3, 1)
src2 = gr.sig_source_f (input_rate, gr.GR_CONST_WAVE, 100*5.75e3, 1)
noise2 = analog.noise_source_f(analog.GR_UNIFORM, 1.0/10)
@@ -653,7 +643,6 @@ class test_app_block (stdgui2.std_top_block):
sample_rate=input_rate, baseband_freq=100e3,
ref_level=0, y_per_div=20, y_divs=10)
vbox.Add (sink2.win, 1, wx.EXPAND)
->>>>>>> master:gr-wxgui/src/python/fftsink_nongl.py
self.connect(src2, (add2,0))
self.connect(noise2, (add2,1))
--
cgit v1.2.3