diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-03-17 16:37:31 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-03-17 16:37:31 -0400 |
| commit | 05662a273bb05a99a835a987302a5d43856ee51c (patch) | |
| tree | fc0aad759a774250a8dbaab6fb1389ab253c06f6 | |
| parent | 20c83953f6f79fa6d440a87159bb067b6996cca4 (diff) | |
| parent | d9dbb6b489deb142bb0ea0e532ab8a0317982002 (diff) | |
Merge remote-tracking branch 'smunaut/qtgui_fixes'
36 files changed, 132 insertions, 0 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index 6b305f6e0d..f413ce9b54 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -64,9 +64,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_y_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index 8c2a0d08e5..fcbfd72ec3 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -71,9 +71,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index 25a4c80b49..c49b9d9ec0 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -71,9 +71,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index 07ad124c3b..96d2b57732 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -85,9 +85,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif public: diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index d1c35ebda9..e0c770039f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -77,9 +77,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index 7d56a7a499..0e8004b1ed 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -77,9 +77,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h index 5304dd4f84..586007bf5f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -76,9 +76,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h index 2c13265ae5..2c7699d923 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -73,9 +73,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index f02226cb8e..2d5248552b 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -69,9 +69,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_y_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index 64e347bf83..add53ef603 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -67,9 +67,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_y_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index e1e27a4cc8..17a656949e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -78,9 +78,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void clear_data() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index 006f592bb5..3877158e7c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -77,9 +77,12 @@ namespace gr { QWidget *parent=NULL); virtual void exec_() = 0; + virtual QWidget* qwidget() = 0; #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void clear_data() = 0; diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index bc4b411958..fb0cdade6a 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -148,6 +148,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + const_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index e2faa72eb0..3b1de226ff 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -70,6 +70,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 0f37fe80a4..ff40ff3f43 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -174,6 +174,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + freq_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index f068e657f5..15b513715c 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -87,6 +87,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index b77e52347c..4f5ba5a386 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -174,6 +174,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + freq_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index c7e9fe83dc..68cb8c66b4 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -87,6 +87,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index 4b3aa29693..dc3e63cb01 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -150,6 +150,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + histogram_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index e2558890b9..58d43e49d1 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -72,6 +72,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index 12720bde2f..992512a999 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -180,6 +180,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index 56c90f3f80..18508d30aa 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -85,6 +85,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index a3567aec94..0a0e119181 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -172,6 +172,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 801a200bb8..68331cc4e6 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -83,6 +83,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index 5e5a9f505d..a1189f4413 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -169,6 +169,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_raster_sink_b_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 680056822c..bd568e91c0 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -78,6 +78,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_update_time(double t); diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index a68a503c7a..c8b865d55d 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -167,6 +167,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_raster_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index f7caf75842..1e0dcf8370 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -77,6 +77,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_update_time(double t); diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 0f723f8b3d..e86ffca227 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -153,6 +153,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 03dcbe2fc0..6a75789059 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -88,6 +88,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index f547185415..e571654615 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -155,6 +155,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index bbad48dc48..7505642389 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -88,6 +88,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index ded93d19d3..2c436db789 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -173,6 +173,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + waterfall_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 95781c564d..aad4a4debb 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -85,6 +85,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void clear_data(); diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index bb6c3e050d..fc6d9fab67 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -172,6 +172,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + waterfall_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 97c6aa2def..172f873a7f 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -85,6 +85,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void clear_data(); |