[Commit-gnuradio] r9084 - gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python

[trondeau]

Author: trondeau
Date: 2008-07-30 21:42:27 -0600 (Wed, 30 Jul 2008)
New Revision: 9084

Modified:
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/Makefile.am
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_f.py
Log:
Cleaning up Python example files

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/Makefile.am 
2008-07-31 03:41:46 UTC (rev 9083)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/Makefile.am 
2008-07-31 03:42:27 UTC (rev 9084)
@@ -27,14 +27,8 @@
 TESTS =                                \
        run_tests
 
-
-grblkspythondir = $(grpythondir)/blks2impl
-
-grblkspython_PYTHON =          \
-       cvsd.py
-
 noinst_PYTHON =                        \
-       encdec.py                       \
-       qa_cvsd_vocoder.py              
+       qttest_f.py                     \
+       qttest_c.py             
 
 CLEANFILES = *.pyc *.pyo

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py 
2008-07-31 03:41:46 UTC (rev 9083)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py 
2008-07-31 03:42:27 UTC (rev 9084)
@@ -14,21 +14,12 @@
         src1 = gr.sig_source_c(1, gr.GR_SIN_WAVE, 0.1, 0.01, 0)
         src2 = gr.sig_source_c(1, gr.GR_SIN_WAVE, 0.015, 0.01, 0)
         src  = gr.add_cc()
-        head = gr.head(gr.sizeof_gr_complex, 4096)
         thr = gr.throttle(gr.sizeof_gr_complex, 20*fftsize)
         self.snk = qtgui.sink_c(fftsize, win, -0.5, 0.5)
 
-        s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fftsize);
-        fft = gr.fft_vcc(fftsize, True, list(), True)
-        v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fftsize);
-        mul = gr.multiply_const_cc(0.01)
-
         self.connect(src1, (src,0))
         self.connect(src2, (src,1))
         self.connect(src,  thr, self.snk)
-        #self.connect(src, thr, s2v, fft, v2s, mul, self.snk)
-        #self.connect(thr, s2v, fft, v2s, mul, 
gr.file_sink(gr.sizeof_gr_complex, "freq.dat"))
-        #self.connect(thr, gr.file_sink(gr.sizeof_gr_complex, "time.dat"))
         
 if __name__ == "__main__":
     tb = my_top_block();

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_f.py
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_f.py 
2008-07-31 03:41:46 UTC (rev 9083)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_f.py 
2008-07-31 03:42:27 UTC (rev 9084)
@@ -9,24 +9,17 @@
 
         fftsize = 8192
 
+        win = gr.firdes.window(gr.firdes.WIN_HANN, fftsize, 0)
+
         src1 = gr.sig_source_f(1, gr.GR_SIN_WAVE, 0.1, 0.1, 0)
         src2 = gr.sig_source_f(1, gr.GR_SIN_WAVE, 0.015, 0.1, 0)
         src  = gr.add_ff()
-        head = gr.head(gr.sizeof_float, 4096)
         thr = gr.throttle(gr.sizeof_float, 20*fftsize)
-        self.snk = qtgui.sink_f(fftsize, list(), -0.5, 0.5)
-        #self.snk = gr.null_sink(gr.sizeof_float)
-
-        s2v = gr.stream_to_vector(gr.sizeof_float, fftsize);
-        fft = gr.fft_vfc(fftsize, True, list())
-        v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fftsize);
+        self.snk = qtgui.sink_f(fftsize, win, -0.5, 0.5)
         
         self.connect(src1, (src,0))
         self.connect(src2, (src,1))
         self.connect(src,  thr, self.snk)
-        #self.connect(src, thr, s2v, fft, v2s, mul, self.snk)
-        #self.connect(thr, s2v, fft, v2s, gr.file_sink(gr.sizeof_gr_complex, 
"freq_f.dat"))
-        #self.connect(thr, gr.file_sink(gr.sizeof_float, "time_f.dat"))
         
 if __name__ == "__main__":
     tb = my_top_block();