From a20c127a9469aeac9ec60bf432c4128c49349f34 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Wed, 3 Nov 2010 20:53:07 -0700 Subject: Generation of python docstrings from doxygen xml. swig_doc.i is a swig interface file containing all the docstrings. It is generated using swig_doc.py and included by gnuradio.i. Minor changes to the swig make files have been made so that the generation of swig_doc.i occurs. --- gr-qtgui/src/lib/Makefile.swig.gen | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index f40f0d881..f4bf06df1 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -107,11 +107,12 @@ qtgui_python_PYTHON = \ ## Entry rule for running SWIG -qtgui.h qtgui.py qtgui.cc: qtgui.i +qtgui.h qtgui.py qtgui.cc: qtgui.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## -## * The .i file is newer than any or all of the generated files; +## * The .i file or the swig_doc.i are newer than any or all of the +## generated files; ## ## * Any or all of the .cc, .h, or .py files does not exist and is ## needed (in the case this file is not needed, the rule for it is -- cgit From 44ad2b33d0b86f0ffe95d025fefa2c774cf80c85 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sun, 30 Jan 2011 13:36:24 -0700 Subject: Fixed Makefiles to generate swig_doc.i --- gr-qtgui/src/lib/Makefile.swig.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index 9c4c0b58c..f64fe4334 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -105,7 +105,7 @@ _qtgui_la_CXXFLAGS = \ $(qtgui_la_swig_cxxflags) python/qtgui.cc: qtgui.py -qtgui.py: qtgui.i +qtgui.py: qtgui.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i # Include the python dependencies for this file -include python/qtgui.d -- cgit From 315f45c234e2fa84fc83641c8404cc5fcdb8412e Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sun, 27 Feb 2011 13:40:48 -0700 Subject: Removing docstring generation from this branch. --- gr-qtgui/src/lib/Makefile.swig.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index f64fe4334..b7a0f3c07 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -105,7 +105,7 @@ _qtgui_la_CXXFLAGS = \ $(qtgui_la_swig_cxxflags) python/qtgui.cc: qtgui.py -qtgui.py: qtgui.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i +qtgui.py: qtgui.i # Include the python dependencies for this file -include python/qtgui.d -- cgit From 97fd10af58ecd4effcf1715eed502836e3c2e1da Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 9 May 2011 12:13:50 +0100 Subject: gr-qtgui: makes time sink a sync_block (since it is) and uses set_output_multiple instead of forecast. The result is that multiple streams maintain constant relationship, which they did not before. This should also prevent us from having to keep so much book-keeping of the indecies, and we will hopefully be able to clean this up soon. --- gr-qtgui/lib/qtgui_time_sink_c.cc | 32 ++++++++++++-------------------- gr-qtgui/lib/qtgui_time_sink_c.h | 25 +++++++++++-------------- gr-qtgui/lib/qtgui_time_sink_f.cc | 28 ++++++++++------------------ gr-qtgui/lib/qtgui_time_sink_f.h | 13 +++++-------- gr-qtgui/swig/qtgui_time_sink_c.i | 2 +- gr-qtgui/swig/qtgui_time_sink_f.i | 2 +- 6 files changed, 40 insertions(+), 62 deletions(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/lib/qtgui_time_sink_c.cc b/gr-qtgui/lib/qtgui_time_sink_c.cc index 6c4793ea1..e5c4cd7d6 100644 --- a/gr-qtgui/lib/qtgui_time_sink_c.cc +++ b/gr-qtgui/lib/qtgui_time_sink_c.cc @@ -44,9 +44,9 @@ qtgui_time_sink_c::qtgui_time_sink_c (int size, double bw, const std::string &name, int nconnections, QWidget *parent) - : gr_block ("time_sink_c", - gr_make_io_signature (nconnections, nconnections, sizeof(gr_complex)), - gr_make_io_signature (0, 0, 0)), + : gr_sync_block ("time_sink_c", + gr_make_io_signature (nconnections, nconnections, sizeof(gr_complex)), + gr_make_io_signature (0, 0, 0)), d_size(size), d_bandwidth(bw), d_name(name), d_nconnections(2*nconnections), d_parent(parent) { @@ -59,6 +59,7 @@ qtgui_time_sink_c::qtgui_time_sink_c (int size, double bw, } initialize(); + set_output_multiple(d_size); } qtgui_time_sink_c::~qtgui_time_sink_c() @@ -69,15 +70,6 @@ qtgui_time_sink_c::~qtgui_time_sink_c() } } -void -qtgui_time_sink_c::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - unsigned int ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = std::min(d_size, 8191); - } -} - void qtgui_time_sink_c::initialize() { @@ -144,10 +136,9 @@ qtgui_time_sink_c::set_color(int which, const std::string &color) } int -qtgui_time_sink_c::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) +qtgui_time_sink_c::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) { int n=0, j=0, idx=0; const gr_complex *in = (const gr_complex*)input_items[idx]; @@ -159,7 +150,6 @@ qtgui_time_sink_c::general_work (int noutput_items, // If we have enough input for one full plot, do it if(datasize >= resid) { - d_current_time = get_highres_clock(); // Fill up residbufs with d_size number of items for(n = 0; n < d_nconnections; n+=2) { @@ -171,6 +161,7 @@ qtgui_time_sink_c::general_work (int noutput_items, } // Update the plot if its time + d_current_time = get_highres_clock(); if(diff_timespec(d_current_time, d_last_time) > d_update_time) { d_last_time = d_current_time; d_qApplication->postEvent(d_main_gui, @@ -181,7 +172,9 @@ qtgui_time_sink_c::general_work (int noutput_items, j += resid; } // Otherwise, copy what we received into the residbufs for next time + // because we set the output_multiple, this should never need to be called else { + assert(0); for(n = 0; n < d_nconnections; n+=2) { in = (const gr_complex*)input_items[idx++]; for(unsigned int k = 0; k < resid; k++) { @@ -193,7 +186,6 @@ qtgui_time_sink_c::general_work (int noutput_items, j += datasize; } } - - consume_each(j); - return j; + + return noutput_items; } diff --git a/gr-qtgui/lib/qtgui_time_sink_c.h b/gr-qtgui/lib/qtgui_time_sink_c.h index aa46ab3a7..8366fc617 100644 --- a/gr-qtgui/lib/qtgui_time_sink_c.h +++ b/gr-qtgui/lib/qtgui_time_sink_c.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -35,24 +35,22 @@ class qtgui_time_sink_c; typedef boost::shared_ptr qtgui_time_sink_c_sptr; GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, - const std::string &name, - int nconnectons=1, - QWidget *parent=NULL); + const std::string &name, + int nconnectons=1, + QWidget *parent=NULL); -class GR_QTGUI_API qtgui_time_sink_c : public gr_block +class GR_QTGUI_API qtgui_time_sink_c : public gr_sync_block { private: friend GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, - const std::string &name, - int nconnections, - QWidget *parent); + const std::string &name, + int nconnections, + QWidget *parent); qtgui_time_sink_c(int size, double bw, const std::string &name, int nconnections, QWidget *parent=NULL); - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - void initialize(); int d_size; @@ -84,10 +82,9 @@ public: QApplication *d_qApplication; - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); }; #endif /* INCLUDED_QTGUI_TIME_SINK_C_H */ diff --git a/gr-qtgui/lib/qtgui_time_sink_f.cc b/gr-qtgui/lib/qtgui_time_sink_f.cc index 28789c163..ac7b853b5 100644 --- a/gr-qtgui/lib/qtgui_time_sink_f.cc +++ b/gr-qtgui/lib/qtgui_time_sink_f.cc @@ -44,9 +44,9 @@ qtgui_time_sink_f::qtgui_time_sink_f (int size, double bw, const std::string &name, int nconnections, QWidget *parent) - : gr_block ("time_sink_f", - gr_make_io_signature (nconnections, nconnections, sizeof(float)), - gr_make_io_signature (0, 0, 0)), + : gr_sync_block ("time_sink_f", + gr_make_io_signature (nconnections, nconnections, sizeof(float)), + gr_make_io_signature (0, 0, 0)), d_size(size), d_bandwidth(bw), d_name(name), d_nconnections(nconnections), d_parent(parent) { @@ -59,6 +59,7 @@ qtgui_time_sink_f::qtgui_time_sink_f (int size, double bw, } initialize(); + set_output_multiple(d_size); } qtgui_time_sink_f::~qtgui_time_sink_f() @@ -69,15 +70,6 @@ qtgui_time_sink_f::~qtgui_time_sink_f() } } -void -qtgui_time_sink_f::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - unsigned int ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = std::min(d_size, 8191); - } -} - void qtgui_time_sink_f::initialize() { @@ -144,10 +136,9 @@ qtgui_time_sink_f::set_color(int which, const std::string &color) } int -qtgui_time_sink_f::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) +qtgui_time_sink_f::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) { int n=0, j=0, idx=0; const float *in = (const float*)input_items[idx]; @@ -180,7 +171,9 @@ qtgui_time_sink_f::general_work (int noutput_items, j += resid; } // Otherwise, copy what we received into the residbufs for next time + // because we set the output_multiple, this should never need to be called else { + assert(0); for(n = 0; n < d_nconnections; n++) { in = (const float*)input_items[idx++]; for(unsigned int k = 0; k < resid; k++) { @@ -192,6 +185,5 @@ qtgui_time_sink_f::general_work (int noutput_items, } } - consume_each(j); - return j; + return noutput_items; } diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/lib/qtgui_time_sink_f.h index 29fca79ee..b4865024e 100644 --- a/gr-qtgui/lib/qtgui_time_sink_f.h +++ b/gr-qtgui/lib/qtgui_time_sink_f.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, int nconnectons=1, QWidget *parent=NULL); -class GR_QTGUI_API qtgui_time_sink_f : public gr_block +class GR_QTGUI_API qtgui_time_sink_f : public gr_sync_block { private: friend GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, @@ -51,8 +51,6 @@ private: int nconnections, QWidget *parent=NULL); - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - void initialize(); int d_size; @@ -84,10 +82,9 @@ public: QApplication *d_qApplication; - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); }; #endif /* INCLUDED_QTGUI_TIME_SINK_F_H */ diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index 8f5c9f4f0..e7240aa69 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -33,7 +33,7 @@ qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, int nconnections=1, QWidget *parent=NULL); -class qtgui_time_sink_c : public gr_block +class qtgui_time_sink_c : public gr_sync_block { private: friend qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, diff --git a/gr-qtgui/swig/qtgui_time_sink_f.i b/gr-qtgui/swig/qtgui_time_sink_f.i index b92efe7be..06af42da3 100644 --- a/gr-qtgui/swig/qtgui_time_sink_f.i +++ b/gr-qtgui/swig/qtgui_time_sink_f.i @@ -33,7 +33,7 @@ qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, int nconnections=1, QWidget *parent=NULL); -class qtgui_time_sink_f : public gr_block +class qtgui_time_sink_f : public gr_sync_block { private: friend qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, -- cgit From 8584298ae45ad1a0210e5d4ed67cdfae64a93c7c Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 9 May 2011 16:33:39 +0100 Subject: gr-qtgui: adding the various windows as initial options for the qtgui sink in GRC. --- gr-qtgui/grc/qtgui_sink_x.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gr-qtgui') diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml index 8c470a1a5..83d6ec287 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -57,6 +57,26 @@ $(gui_hint()($win)) Blackman-harris firdes.WIN_BLACKMAN_hARRIS + + + + + Center Frequency (Hz) -- cgit