diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-03-17 16:41:11 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-03-17 16:41:11 -0400 |
| commit | e7942e24a48cde22e7503fec763983230bf65354 (patch) | |
| tree | 7d58a58260010ab1cdc36d17dd451c3759b1d43b | |
| parent | 05662a273bb05a99a835a987302a5d43856ee51c (diff) | |
qtgui: fixes number sink to handle Python/C++ exposure (see: 6a78af5919133 and d9dbb6b489deb)
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/number_sink.h | 3 | ||||
| -rw-r--r-- | gr-qtgui/lib/number_sink_impl.cc | 6 | ||||
| -rw-r--r-- | gr-qtgui/lib/number_sink_impl.h | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index c3829a1072..7c7b86595b 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.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/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index a2a7d67e59..abfb8725f4 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -131,6 +131,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + number_sink_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index ca1ad0f880..0f4fd48262 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -78,6 +78,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_update_time(double t); |