diff options
| author | David Winter <david.winter@analog.com> | 2021-08-09 13:24:24 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-09-03 16:12:30 -0400 |
| commit | 956f332e410331fde426e1485589d905cdf80fb1 (patch) | |
| tree | c1004bbc58e99afe1ed2daf404d11020626e2980 /gr-qtgui/lib | |
| parent | 4d0f2900e887b87e547a1af5874b5d502b5fc71e (diff) | |
qtgui: Replace pyqwidget() with qwidget()
Previously, two versions of the `qtwidget` functions existed,
`qwidget()` and `pyqwidget()`, with the only difference being that
`qwidget()` returned a pointer to the `QWidget` object managed by the
corresponding block, while `pyqwidget()` returned that same pointer, but as
an integer (Or `PyLong` in this case).
While `qwidget()` is used by C++ code accessing the widgets,
`pyqwidget()` is only used for the python interface. This makes these
two methods redundant, thus this commit entirely removes `pyqwidget()`,
and modifies the `qwidget()` python wrapper to behave like
`pyqwidget()`. Note that we can be fairly confident that this change
will not effect potential users of `qwidget()`, because any invocation
on the objects previously returned by `qwidget()` would cause a
segmentation fault.
This commit also fixes a memory leak:
Internally, the `pyqwidget()` functions were returning a PyLong `PyObject *`,
which was then upwrapped in a pybind trampoline without decrementing
the reference count of that python object.
Signed-off-by: David Winter <david.winter@analog.com>
Diffstat (limited to 'gr-qtgui/lib')
36 files changed, 0 insertions, 306 deletions
diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index c223570a0b..be3c6ba378 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -140,17 +140,6 @@ void ber_sink_b_impl::exec_() { d_qApplication->exec(); } QWidget* ber_sink_b_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* ber_sink_b_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* ber_sink_b_impl::pyqwidget() { return NULL; } -#endif - void ber_sink_b_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/ber_sink_b_impl.h b/gr-qtgui/lib/ber_sink_b_impl.h index 05aa91011e..8e46f78b5b 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.h +++ b/gr-qtgui/lib/ber_sink_b_impl.h @@ -62,12 +62,6 @@ public: void exec_() override; QWidget* qwidget(); -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_x_axis(double min, double max) override; diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 568949c977..e4b09c7d48 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -104,17 +104,6 @@ void const_sink_c_impl::exec_() { d_qApplication->exec(); } QWidget* const_sink_c_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* const_sink_c_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* const_sink_c_impl::pyqwidget() { return NULL; } -#endif - void const_sink_c_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 686a0ea30b..5321d7fff9 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -84,12 +84,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_x_axis(double min, double max) override; diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index 43edf15821..0794a1268c 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -170,17 +170,6 @@ void edit_box_msg_impl::exec_() { d_qApplication->exec(); } QWidget* edit_box_msg_impl::qwidget() { return (QWidget*)d_group; } -#ifdef ENABLE_PYTHON -PyObject* edit_box_msg_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_group); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* edit_box_msg_impl::pyqwidget() { return NULL; } -#endif - void edit_box_msg_impl::set_type(int type) { set_type(static_cast<data_type_t>(type)); } void edit_box_msg_impl::set_type(gr::qtgui::data_type_t type) diff --git a/gr-qtgui/lib/edit_box_msg_impl.h b/gr-qtgui/lib/edit_box_msg_impl.h index bf84d784ba..5b45fd8a73 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.h +++ b/gr-qtgui/lib/edit_box_msg_impl.h @@ -68,12 +68,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_value(pmt::pmt_t val); public slots: diff --git a/gr-qtgui/lib/eye_sink_c_impl.cc b/gr-qtgui/lib/eye_sink_c_impl.cc index 8a602790a0..6df953b8c9 100644 --- a/gr-qtgui/lib/eye_sink_c_impl.cc +++ b/gr-qtgui/lib/eye_sink_c_impl.cc @@ -122,17 +122,6 @@ void eye_sink_c_impl::exec_() { d_qApplication->exec(); } QWidget* eye_sink_c_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* eye_sink_c_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* eye_sink_c_impl::pyqwidget() { return NULL; } -#endif - void eye_sink_c_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/eye_sink_c_impl.h b/gr-qtgui/lib/eye_sink_c_impl.h index 16f965298b..b6060072ad 100644 --- a/gr-qtgui/lib/eye_sink_c_impl.h +++ b/gr-qtgui/lib/eye_sink_c_impl.h @@ -88,12 +88,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_y_label(const std::string& label, const std::string& unit = "") override; void set_update_time(double t) override; diff --git a/gr-qtgui/lib/eye_sink_f_impl.cc b/gr-qtgui/lib/eye_sink_f_impl.cc index 16b4c39c63..db08ce821a 100644 --- a/gr-qtgui/lib/eye_sink_f_impl.cc +++ b/gr-qtgui/lib/eye_sink_f_impl.cc @@ -117,17 +117,6 @@ void eye_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* eye_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* eye_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* eye_sink_f_impl::pyqwidget() { return NULL; } -#endif - void eye_sink_f_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/eye_sink_f_impl.h b/gr-qtgui/lib/eye_sink_f_impl.h index bcacf02ea9..502490cbad 100644 --- a/gr-qtgui/lib/eye_sink_f_impl.h +++ b/gr-qtgui/lib/eye_sink_f_impl.h @@ -85,12 +85,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_y_label(const std::string& label, const std::string& unit = "") override; void set_update_time(double t) override; diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 445fb359c0..dfb984f7a2 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -139,17 +139,6 @@ void freq_sink_c_impl::exec_() { d_qApplication->exec(); } QWidget* freq_sink_c_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* freq_sink_c_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* freq_sink_c_impl::pyqwidget() { return NULL; } -#endif - void freq_sink_c_impl::set_fft_size(const int fftsize) { if ((fftsize > 16) && (fftsize < 16384)) diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 09a318a426..5e70b99e66 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -115,12 +115,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_fft_size(const int fftsize) override; int fft_size() const override; void set_fft_average(const float fftavg) override; diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index b26dce275d..a3920329bb 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -139,17 +139,6 @@ void freq_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* freq_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* freq_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* freq_sink_f_impl::pyqwidget() { return NULL; } -#endif - void freq_sink_f_impl::set_fft_size(const int fftsize) { if ((fftsize > 16) && (fftsize < 16384)) diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index c1eaf5547a..e1f39f7f98 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -115,12 +115,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_fft_size(const int fftsize) override; int fft_size() const override; void set_fft_average(const float fftavg) override; diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index f6c58ebf47..dc9d58294a 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -114,17 +114,6 @@ void histogram_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* histogram_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* histogram_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* histogram_sink_f_impl::pyqwidget() { return NULL; } -#endif - void histogram_sink_f_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index 3c9e682790..d59429437e 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -72,12 +72,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_x_axis(double min, double max) override; void set_update_time(double t) override; diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index 2a50ab51c2..0438568ec5 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -93,17 +93,6 @@ void number_sink_impl::exec_() { d_qApplication->exec(); } QWidget* number_sink_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* number_sink_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* number_sink_impl::pyqwidget() { return NULL; } -#endif - void number_sink_impl::set_update_time(double t) { // convert update time to ticks diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index 7b5dfdc37f..717f368adb 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -69,12 +69,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_update_time(double t) override; void set_average(const float avg) override; void set_graph_type(const graph_t type) override; diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index 744279e7c7..8fe6a067c4 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -140,17 +140,6 @@ void sink_c_impl::exec_() { d_qApplication->exec(); } QWidget* sink_c_impl::qwidget() { return d_main_gui.qwidget(); } -#ifdef ENABLE_PYTHON -PyObject* sink_c_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui.qwidget()); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* sink_c_impl::pyqwidget() { return NULL; } -#endif - void sink_c_impl::set_fft_size(const int fftsize) { d_fftsize = fftsize; diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index 53b81caec7..f9f524b927 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -92,12 +92,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_fft_size(const int fftsize) override; int fft_size() const override; diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 74d8cf6430..052e6ecd92 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -133,17 +133,6 @@ void sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* sink_f_impl::qwidget() { return d_main_gui.qwidget(); } -#ifdef ENABLE_PYTHON -PyObject* sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui.qwidget()); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* sink_f_impl::pyqwidget() { return NULL; } -#endif - void sink_f_impl::set_fft_size(const int fftsize) { d_fftsize = fftsize; diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index c1e9c431f0..8086671048 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -93,12 +93,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_fft_size(const int fftsize) override; int fft_size() const override; diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index f9e8b2faa5..9211dc70ca 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -122,17 +122,6 @@ void time_raster_sink_b_impl::exec_() { d_qApplication->exec(); } QWidget* time_raster_sink_b_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* time_raster_sink_b_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* time_raster_sink_b_impl::pyqwidget() { return NULL; } -#endif - void time_raster_sink_b_impl::set_x_label(const std::string& label) { d_main_gui->setXLabel(label); diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index d8dcf527fb..64c9d6ccef 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -75,12 +75,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_x_label(const std::string& label) override; void set_x_range(double start, double end) override; void set_y_label(const std::string& label) override; diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index a9104b0b77..3648c60047 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -119,17 +119,6 @@ void time_raster_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* time_raster_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* time_raster_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* time_raster_sink_f_impl::pyqwidget() { return NULL; } -#endif - void time_raster_sink_f_impl::set_x_label(const std::string& label) { d_main_gui->setXLabel(label); diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 5cf2da6257..1c69c24e1c 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -74,12 +74,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_x_label(const std::string& label) override; void set_x_range(double start, double end) override; void set_y_label(const std::string& label) override; diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 84579528a4..b700f584d5 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -127,17 +127,6 @@ void time_sink_c_impl::exec_() { d_qApplication->exec(); } QWidget* time_sink_c_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* time_sink_c_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* time_sink_c_impl::pyqwidget() { return NULL; } -#endif - void time_sink_c_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 9e2d4f4e35..1542f583ba 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -83,12 +83,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_y_label(const std::string& label, const std::string& unit = "") override; void set_update_time(double t) override; diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index f8b179c985..6b79a6ec8c 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -125,17 +125,6 @@ void time_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* time_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* time_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* time_sink_f_impl::pyqwidget() { return NULL; } -#endif - void time_sink_f_impl::set_y_axis(double min, double max) { d_main_gui->setYaxis(min, max); diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index cedef648f0..976f38d10d 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -82,12 +82,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void set_y_axis(double min, double max) override; void set_y_label(const std::string& label, const std::string& unit = "") override; void set_update_time(double t) override; diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc index 7aab4611e5..473a99182f 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -117,17 +117,6 @@ void vector_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* vector_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* vector_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* vector_sink_f_impl::pyqwidget() { return NULL; } -#endif - unsigned int vector_sink_f_impl::vlen() const { return d_vlen; } void vector_sink_f_impl::set_vec_average(const float avg) diff --git a/gr-qtgui/lib/vector_sink_f_impl.h b/gr-qtgui/lib/vector_sink_f_impl.h index a76e0c6402..fb93716c35 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.h +++ b/gr-qtgui/lib/vector_sink_f_impl.h @@ -82,12 +82,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - unsigned int vlen() const override; void set_vec_average(const float avg) override; float vec_average() const override; diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index e3f554df12..cfd4db0f28 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -138,17 +138,6 @@ void waterfall_sink_c_impl::exec_() { d_qApplication->exec(); } QWidget* waterfall_sink_c_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* waterfall_sink_c_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* waterfall_sink_c_impl::pyqwidget() { return NULL; } -#endif - void waterfall_sink_c_impl::clear_data() { d_main_gui->clearData(); } void waterfall_sink_c_impl::set_fft_size(const int fftsize) diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index c7e258a809..fd0cd9decc 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -99,12 +99,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void clear_data() override; void set_fft_size(const int fftsize) override; diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index 11299326f0..52cbf03fbc 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -135,17 +135,6 @@ void waterfall_sink_f_impl::exec_() { d_qApplication->exec(); } QWidget* waterfall_sink_f_impl::qwidget() { return d_main_gui; } -#ifdef ENABLE_PYTHON -PyObject* waterfall_sink_f_impl::pyqwidget() -{ - PyObject* w = PyLong_FromVoidPtr((void*)d_main_gui); - PyObject* retarg = Py_BuildValue("N", w); - return retarg; -} -#else -void* waterfall_sink_f_impl::pyqwidget() { return NULL; } -#endif - void waterfall_sink_f_impl::clear_data() { d_main_gui->clearData(); } void waterfall_sink_f_impl::set_fft_size(const int fftsize) diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 099356c798..783f15453d 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -99,12 +99,6 @@ public: void exec_() override; QWidget* qwidget() override; -#ifdef ENABLE_PYTHON - PyObject* pyqwidget() override; -#else - void* pyqwidget(); -#endif - void clear_data() override; void set_fft_size(const int fftsize) override; |