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 | |
| parent | gr-video-sdl: Remove if (1) (diff) | |
| download | gnuradio-956f332e410331fde426e1485589d905cdf80fb1.tar.xz gnuradio-956f332e410331fde426e1485589d905cdf80fb1.zip | |
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')
118 files changed, 95 insertions, 723 deletions
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py index 2172b5e0c..39e5cfbfc 100644 --- a/gr-qtgui/apps/uhd_display.py +++ b/gr-qtgui/apps/uhd_display.py @@ -207,7 +207,7 @@ class my_top_block(gr.top_block): # Get the reference pointer to the SpectrumDisplayForm QWidget # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtGui.QWidget - self.pysink = sip.wrapinstance(self.snk.pyqwidget(), QtGui.QWidget) + self.pysink = sip.wrapinstance(self.snk.qwidget(), QtGui.QWidget) self.main_win = main_window(self.pysink, self) diff --git a/gr-qtgui/docs/qtgui.dox b/gr-qtgui/docs/qtgui.dox index 4d1b41e74..8af845da0 100644 --- a/gr-qtgui/docs/qtgui.dox +++ b/gr-qtgui/docs/qtgui.dox @@ -161,7 +161,7 @@ class grclass(gr.top_block): samp_rate, #bw "QT GUI Plot") #name - self.snk_win = sip.wrapinstance(self.snk.pyqwidget(), Qt.QWidget) + self.snk_win = sip.wrapinstance(self.snk.qwidget(), Qt.QWidget) self.snk_win.show() def main(): diff --git a/gr-qtgui/examples/pyqt_const_c.py b/gr-qtgui/examples/pyqt_const_c.py index d97c7aa8d..0f3cf6060 100644 --- a/gr-qtgui/examples/pyqt_const_c.py +++ b/gr-qtgui/examples/pyqt_const_c.py @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index 579dc462a..9485c050a 100644 --- a/gr-qtgui/examples/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py @@ -159,7 +159,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py index 2503e4b7f..c8e06b872 100644 --- a/gr-qtgui/examples/pyqt_example_f.py +++ b/gr-qtgui/examples/pyqt_example_f.py @@ -152,7 +152,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py index c8f806a79..8f3387bef 100644 --- a/gr-qtgui/examples/pyqt_freq_c.py +++ b/gr-qtgui/examples/pyqt_freq_c.py @@ -160,7 +160,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_freq_f.py b/gr-qtgui/examples/pyqt_freq_f.py index 3aa5e6bc0..15949495c 100644 --- a/gr-qtgui/examples/pyqt_freq_f.py +++ b/gr-qtgui/examples/pyqt_freq_f.py @@ -150,7 +150,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_histogram_f.py b/gr-qtgui/examples/pyqt_histogram_f.py index abe435368..d35cc90cc 100644 --- a/gr-qtgui/examples/pyqt_histogram_f.py +++ b/gr-qtgui/examples/pyqt_histogram_f.py @@ -164,7 +164,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py index 68ae401f0..3a47a6d57 100644 --- a/gr-qtgui/examples/pyqt_time_c.py +++ b/gr-qtgui/examples/pyqt_time_c.py @@ -158,7 +158,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_time_f.py b/gr-qtgui/examples/pyqt_time_f.py index 0f9f33c01..0bbbfa57d 100644 --- a/gr-qtgui/examples/pyqt_time_f.py +++ b/gr-qtgui/examples/pyqt_time_f.py @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_time_raster_b.py b/gr-qtgui/examples/pyqt_time_raster_b.py index c09c6a3cb..712fe3956 100644 --- a/gr-qtgui/examples/pyqt_time_raster_b.py +++ b/gr-qtgui/examples/pyqt_time_raster_b.py @@ -58,7 +58,7 @@ class my_top_block(gr.top_block): self.connect(src1, (self.snk1, 1)) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_time_raster_f.py b/gr-qtgui/examples/pyqt_time_raster_f.py index f8b115819..aa4e4a800 100644 --- a/gr-qtgui/examples/pyqt_time_raster_f.py +++ b/gr-qtgui/examples/pyqt_time_raster_f.py @@ -57,7 +57,7 @@ class my_top_block(gr.top_block): self.connect(src1, (self.snk1, 1)) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py index 4d1361e0d..a3bf5282c 100644 --- a/gr-qtgui/examples/pyqt_waterfall_c.py +++ b/gr-qtgui/examples/pyqt_waterfall_c.py @@ -164,7 +164,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/examples/pyqt_waterfall_f.py b/gr-qtgui/examples/pyqt_waterfall_f.py index d7778047c..15e0512df 100644 --- a/gr-qtgui/examples/pyqt_waterfall_f.py +++ b/gr-qtgui/examples/pyqt_waterfall_f.py @@ -150,7 +150,7 @@ class my_top_block(gr.top_block): self.ctrl_win.attach_signal2(src2) # Get the reference pointer to the SpectrumDisplayForm QWidget - pyQt = self.snk1.pyqwidget() + pyQt = self.snk1.qwidget() # Wrap the pointer as a PyQt SIP object # This can now be manipulated as a PyQt5.QtWidgets.QWidget diff --git a/gr-qtgui/grc/qtgui_ber_sink_b.block.yml b/gr-qtgui/grc/qtgui_ber_sink_b.block.yml index 46c279719..74d271755 100644 --- a/gr-qtgui/grc/qtgui_ber_sink_b.block.yml +++ b/gr-qtgui/grc/qtgui_ber_sink_b.block.yml @@ -367,7 +367,7 @@ templates: self.${id}.set_line_marker(i, markers[i]) self.${id}.set_line_alpha(i, alphas[i]) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_const_sink_x.block.yml b/gr-qtgui/grc/qtgui_const_sink_x.block.yml index 78dfc40f0..ca27b3263 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_const_sink_x.block.yml @@ -448,7 +448,7 @@ templates: self.${id}.set_line_marker(i, markers[i]) self.${id}.set_line_alpha(i, alphas[i]) - self._${id}_win = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + self._${id}_win = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_edit_box_msg.block.yml b/gr-qtgui/grc/qtgui_edit_box_msg.block.yml index 2b57d4a72..ab32ffd52 100644 --- a/gr-qtgui/grc/qtgui_edit_box_msg.block.yml +++ b/gr-qtgui/grc/qtgui_edit_box_msg.block.yml @@ -61,7 +61,7 @@ templates: win = 'self._%s_win'%id %>\ qtgui.edit_box_msg(${type.t}, ${value}, ${label}, ${is_pair}, ${is_static}, ${key}, None) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_eye_sink_x.block.yml b/gr-qtgui/grc/qtgui_eye_sink_x.block.yml index b80434065..58adc1fbb 100644 --- a/gr-qtgui/grc/qtgui_eye_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_eye_sink_x.block.yml @@ -1008,7 +1008,7 @@ templates: self.${id}.set_line_alpha(i, alphas[i]) % endif - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml index 4ca587dea..31877d47e 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml @@ -457,7 +457,7 @@ templates: self.${id}.set_line_color(i, colors[i]) self.${id}.set_line_alpha(i, alphas[i]) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${ gui_hint() % win} cpp_templates: diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml b/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml index 5a2b9d0c8..c160fa793 100644 --- a/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml @@ -414,7 +414,7 @@ templates: self.${id}.set_line_marker(i, markers[i]) self.${id}.set_line_alpha(i, alphas[i]) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_number_sink.block.yml b/gr-qtgui/grc/qtgui_number_sink.block.yml index 8fed9c690..de35ea55b 100644 --- a/gr-qtgui/grc/qtgui_number_sink.block.yml +++ b/gr-qtgui/grc/qtgui_number_sink.block.yml @@ -279,7 +279,7 @@ templates: self.${id}.set_factor(i, factor[i]) self.${id}.enable_autoscale(${autoscale}) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} cpp_templates: diff --git a/gr-qtgui/grc/qtgui_sink_x.block.yml b/gr-qtgui/grc/qtgui_sink_x.block.yml index 325a36924..dcd4ef474 100644 --- a/gr-qtgui/grc/qtgui_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_sink_x.block.yml @@ -127,7 +127,7 @@ templates: None # parent ) self.${id}.set_update_time(1.0/${rate}) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) self.${id}.enable_rf_freq(${showrf}) diff --git a/gr-qtgui/grc/qtgui_time_raster_x.block.yml b/gr-qtgui/grc/qtgui_time_raster_x.block.yml index 26746cd61..1cf5a1bc9 100644 --- a/gr-qtgui/grc/qtgui_time_raster_x.block.yml +++ b/gr-qtgui/grc/qtgui_time_raster_x.block.yml @@ -293,7 +293,7 @@ templates: self.${id}.set_color_map(i, colors[i]) self.${id}.set_line_alpha(i, alphas[i]) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_time_sink_x.block.yml b/gr-qtgui/grc/qtgui_time_sink_x.block.yml index 9f8c4a3bf..e7b3033f4 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_time_sink_x.block.yml @@ -1077,7 +1077,7 @@ templates: self.${id}.set_line_alpha(i, alphas[i]) % endif - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py b/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py index d6a30a58b..ca3178e86 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py +++ b/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py @@ -336,7 +336,7 @@ templates: self.${id}.set_line_alpha(i, alphas[i]) % endif - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_vector_sink_f.block.yml b/gr-qtgui/grc/qtgui_vector_sink_f.block.yml index b56397401..e211a83e8 100644 --- a/gr-qtgui/grc/qtgui_vector_sink_f.block.yml +++ b/gr-qtgui/grc/qtgui_vector_sink_f.block.yml @@ -341,7 +341,7 @@ templates: self.${id}.set_line_color(i, colors[i]) self.${id}.set_line_alpha(i, alphas[i]) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} documentation: |- diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml index 5c44d80ee..1c6ae7763 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml @@ -301,7 +301,7 @@ templates: self.${id}.set_intensity_range(${int_min}, ${int_max}) - ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) + ${win} = sip.wrapinstance(self.${id}.qwidget(), Qt.QWidget) ${gui_hint() % win} diff --git a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h index 71e7f3e6d..4c2ce3259 100644 --- a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h @@ -38,12 +38,6 @@ public: virtual void exec_() = 0; -#ifdef ENABLE_PYTHON - virtual PyObject* pyqwidget() = 0; -#else - virtual void* pyqwidget() = 0; -#endif - virtual void set_y_axis(double min, double max) = 0; virtual void set_x_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index db4c22b77..a1dd5a452 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -64,12 +64,6 @@ public: 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; virtual void set_x_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h index 10137f126..e3fe7485d 100644 --- a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h +++ b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h @@ -124,12 +124,6 @@ public: virtual void exec_() = 0; virtual QWidget* qwidget() = 0; -#ifdef ENABLE_PYTHON - virtual PyObject* pyqwidget() = 0; -#else - virtual void* pyqwidget() = 0; -#endif - QApplication* d_qApplication; }; diff --git a/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h index f551bdcc1..a1ff4f60d 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h @@ -72,12 +72,6 @@ public: 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; virtual void set_y_label(const std::string& label, const std::string& unit = "") = 0; virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h index 8794ed92b..b13e06d7c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h @@ -72,12 +72,6 @@ public: 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; virtual void set_y_label(const std::string& label, const std::string& unit = "") = 0; virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index f04e099d0..1755004f5 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -111,12 +111,6 @@ public: 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; virtual int fft_size() const = 0; virtual void set_fft_average(const float fftavg) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index aacd14e0b..fb3143126 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -111,12 +111,6 @@ public: 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; virtual int fft_size() const = 0; virtual void set_fft_average(const float fftavg) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index 34571e3eb..00fa1f808 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -88,12 +88,6 @@ public: virtual void exec_() = 0; virtual QWidget* qwidget() = 0; -#ifdef ENABLE_PYTHON - virtual PyObject* pyqwidget() = 0; -#else - virtual void* pyqwidget() = 0; -#endif - public: virtual std::string title() = 0; virtual std::string line_label(unsigned int which) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index cf1532a38..57f534d80 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h @@ -77,12 +77,6 @@ public: 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; virtual void set_average(const float avg) = 0; virtual void set_graph_type(const graph_t type) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index 139f057fe..f517715aa 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -92,12 +92,6 @@ public: 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; virtual int fft_size() const = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index 0fe1e3960..add673ee1 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -92,12 +92,6 @@ public: 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; virtual int fft_size() const = 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 6570fda0c..f6b885e2c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -78,12 +78,6 @@ public: virtual void exec_() = 0; virtual QWidget* qwidget() = 0; -#ifdef ENABLE_PYTHON - virtual PyObject* pyqwidget() = 0; -#else - virtual void* pyqwidget() = 0; -#endif - virtual void set_x_label(const std::string& label) = 0; virtual void set_x_range(double start, double end) = 0; virtual void set_y_label(const std::string& label) = 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 d96cbe7a0..45b28e3ca 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -74,12 +74,6 @@ public: virtual void exec_() = 0; virtual QWidget* qwidget() = 0; -#ifdef ENABLE_PYTHON - virtual PyObject* pyqwidget() = 0; -#else - virtual void* pyqwidget() = 0; -#endif - virtual void set_x_label(const std::string& label) = 0; virtual void set_x_range(double start, double end) = 0; virtual void set_y_label(const std::string& label) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index 30d254d7e..a8507e0b6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -71,12 +71,6 @@ public: 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; virtual void set_y_label(const std::string& label, const std::string& unit = "") = 0; virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index 3c9d36109..cb00348a4 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -69,12 +69,6 @@ public: 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; virtual void set_y_label(const std::string& label, const std::string& unit = "") = 0; virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h index eb0e68e7c..3183dfe1f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h @@ -68,12 +68,6 @@ public: virtual void exec_() = 0; virtual QWidget* qwidget() = 0; -#ifdef ENABLE_PYTHON - virtual PyObject* pyqwidget() = 0; -#else - virtual void* pyqwidget() = 0; -#endif - virtual unsigned int vlen() const = 0; virtual void set_vec_average(const float avg) = 0; virtual float vec_average() const = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index 9a4bd9a5f..7c683fb95 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -112,12 +112,6 @@ public: 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; virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index 792d93ce4..bfd5fdc84 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -113,12 +113,6 @@ public: 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; virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index c223570a0..be3c6ba37 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 05aa91011..8e46f78b5 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 568949c97..e4b09c7d4 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 686a0ea30..5321d7fff 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 43edf1582..0794a1268 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 bf84d784b..5b45fd8a7 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 8a602790a..6df953b8c 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 16f965298..b6060072a 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 16b4c39c6..db08ce821 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 bcacf02ea..502490cba 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 445fb359c..dfb984f7a 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 09a318a42..5e70b99e6 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 b26dce275..a3920329b 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 c1eaf5547..e1f39f7f9 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 f6c58ebf4..dc9d58294 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 3c9e68279..d59429437 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 2a50ab51c..0438568ec 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 7b5dfdc37..717f368ad 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 744279e7c..8fe6a067c 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 53b81caec..f9f524b92 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 74d8cf643..052e6ecd9 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 c1e9c431f..808667104 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 f9e8b2faa..9211dc70c 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 d8dcf527f..64c9d6cce 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 a9104b0b7..3648c6004 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 5cf2da625..1c69c24e1 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 84579528a..b700f584d 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 9e2d4f4e3..1542f583b 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 f8b179c98..6b79a6ec8 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 cedef648f..976f38d10 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 7aab4611e..473a99182 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 a76e0c640..fb93716c3 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 e3f554df1..cfd4db0f2 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 c7e258a80..fd0cd9dec 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 11299326f..52cbf03fb 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 099356c79..783f15453 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; diff --git a/gr-qtgui/python/qtgui/auto_correlator_sink.py b/gr-qtgui/python/qtgui/auto_correlator_sink.py index 5d8024d2d..ed69395d1 100644 --- a/gr-qtgui/python/qtgui/auto_correlator_sink.py +++ b/gr-qtgui/python/qtgui/auto_correlator_sink.py @@ -129,4 +129,4 @@ class AutoCorrelatorSink(gr.hier_block2): def getWidget(self): - return sip.wrapinstance(self.timeSink.pyqwidget(), QWidget) + return sip.wrapinstance(self.timeSink.qwidget(), QWidget) diff --git a/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc b/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc index 7d8071d8d..664c9ca7e 100644 --- a/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc +++ b/gr-qtgui/python/qtgui/bindings/ber_sink_b_python.cc @@ -55,19 +55,6 @@ void bind_ber_sink_b(py::module& m) .def("exec_", &ber_sink_b::exec_, D(ber_sink_b, exec_)) - // .def("pyqwidget",&ber_sink_b::pyqwidget, - // D(ber_sink_b,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. - .def( - "pyqwidget", - [](std::shared_ptr<ber_sink_b> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(ber_sink_b, pyqwidget)) - - .def("set_y_axis", &ber_sink_b::set_y_axis, py::arg("min"), diff --git a/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc index bd0fd5912..db2558d1c 100644 --- a/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/const_sink_c_python.cc @@ -56,20 +56,12 @@ void bind_const_sink_c(py::module& m) .def("exec_", &const_sink_c::exec_, D(const_sink_c, exec_)) - .def("qwidget", &const_sink_c::qwidget, D(const_sink_c, qwidget)) - - - // .def("pyqwidget",&const_sink_c::pyqwidget, - // D(const_sink_c,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<const_sink_c> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](const_sink_c& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(const_sink_c, pyqwidget)) + D(const_sink_c, qwidget)) .def("set_y_axis", diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/ber_sink_b_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/ber_sink_b_pydoc_template.h index 9af5de683..114cbe350 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/ber_sink_b_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/ber_sink_b_pydoc_template.h @@ -30,9 +30,6 @@ static const char* __doc_gr_qtgui_ber_sink_b_make = R"doc()doc"; static const char* __doc_gr_qtgui_ber_sink_b_exec_ = R"doc()doc"; -static const char* __doc_gr_qtgui_ber_sink_b_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_ber_sink_b_set_y_axis = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/const_sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/const_sink_c_pydoc_template.h index 09bda3857..b6443ee4e 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/const_sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/const_sink_c_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_const_sink_c_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_const_sink_c_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_const_sink_c_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_const_sink_c_set_y_axis = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/edit_box_msg_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/edit_box_msg_pydoc_template.h index 80c299d0c..e9b3199b7 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/edit_box_msg_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/edit_box_msg_pydoc_template.h @@ -31,6 +31,3 @@ static const char* __doc_gr_qtgui_edit_box_msg_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_edit_box_msg_qwidget = R"doc()doc"; - - -static const char* __doc_gr_qtgui_edit_box_msg_pyqwidget = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h index 53bb9f47a..4a7db88bd 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_eye_sink_c_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_eye_sink_c_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_eye_sink_c_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_eye_sink_c_set_y_axis = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h index e9dc5fd9b..4ecf3455d 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_eye_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_eye_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_eye_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_eye_sink_f_set_y_axis = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_c_pydoc_template.h index 3134354a9..5f7be5cb5 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_c_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_freq_sink_c_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_freq_sink_c_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_freq_sink_c_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_freq_sink_c_set_fft_size = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_f_pydoc_template.h index be6020de4..58296f2d0 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/freq_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_freq_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_freq_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_freq_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_freq_sink_f_set_fft_size = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/histogram_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/histogram_sink_f_pydoc_template.h index a6804fd27..ed4bd4c54 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/histogram_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/histogram_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_histogram_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_histogram_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_histogram_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_histogram_sink_f_title = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/number_sink_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/number_sink_pydoc_template.h index 4d69a0b6a..f56d23b62 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/number_sink_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/number_sink_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_number_sink_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_number_sink_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_number_sink_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_number_sink_set_update_time = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/sink_c_pydoc_template.h index 5422434a7..58f341062 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/sink_c_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_sink_c_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_sink_c_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_sink_c_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_sink_c_set_fft_size = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/sink_f_pydoc_template.h index d0e4fb4b2..018e73a8a 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_sink_f_set_fft_size = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_b_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_b_pydoc_template.h index 4ca1ce62e..e930fa41d 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_b_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_b_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_time_raster_sink_b_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_time_raster_sink_b_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_time_raster_sink_b_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_time_raster_sink_b_set_x_label = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_f_pydoc_template.h index c8b20bbaa..5babd8860 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/time_raster_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_time_raster_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_time_raster_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_time_raster_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_time_raster_sink_f_set_x_label = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_c_pydoc_template.h index aab6d9277..f00057437 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_c_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_time_sink_c_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_time_sink_c_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_time_sink_c_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_time_sink_c_set_y_axis = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_f_pydoc_template.h index 42c319490..93337d102 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/time_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_time_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_time_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_time_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_time_sink_f_set_y_axis = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/vector_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/vector_sink_f_pydoc_template.h index a420fe3b7..e6c593bda 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/vector_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/vector_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_vector_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_vector_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_vector_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_vector_sink_f_vlen = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_c_pydoc_template.h index 8beacb420..999c47a63 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_c_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_waterfall_sink_c_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_waterfall_sink_c_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_waterfall_sink_c_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_waterfall_sink_c_clear_data = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_f_pydoc_template.h index ed9b5b2bf..dcbf6af83 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/waterfall_sink_f_pydoc_template.h @@ -33,9 +33,6 @@ static const char* __doc_gr_qtgui_waterfall_sink_f_exec_ = R"doc()doc"; static const char* __doc_gr_qtgui_waterfall_sink_f_qwidget = R"doc()doc"; -static const char* __doc_gr_qtgui_waterfall_sink_f_pyqwidget = R"doc()doc"; - - static const char* __doc_gr_qtgui_waterfall_sink_f_clear_data = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc b/gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc index e65d81721..b4bc1ee4c 100644 --- a/gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc +++ b/gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc @@ -55,23 +55,11 @@ void bind_edit_box_msg(py::module& m) .def("exec_", &edit_box_msg::exec_, D(edit_box_msg, exec_)) - // .def("pyqwidget",&edit_box_msg::pyqwidget, - // D(edit_box_msg,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. + .def( - "pyqwidget", - [](std::shared_ptr<edit_box_msg> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](edit_box_msg& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(edit_box_msg, pyqwidget)) - - - .def("qwidget", &edit_box_msg::qwidget, D(edit_box_msg, qwidget)) - - - .def("pyqwidget", &edit_box_msg::pyqwidget, D(edit_box_msg, pyqwidget)) - - ; + D(edit_box_msg, qwidget)); } diff --git a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc index b37f303ba..c737c74c3 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc @@ -59,20 +59,11 @@ void bind_eye_sink_c(py::module& m) .def("exec_", &eye_sink_c::exec_, D(eye_sink_c, exec_)) - .def("qwidget", &eye_sink_c::qwidget, D(eye_sink_c, qwidget)) - - - // .def("pyqwidget",&eye_sink_c::pyqwidget, - // D(eye_sink_c,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<eye_sink_c> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(eye_sink_c, pyqwidget)) + "qwidget", + [](eye_sink_c& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(eye_sink_c, qwidget)) + .def("set_y_axis", &eye_sink_c::set_y_axis, diff --git a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc index 61a902b96..ac8d759da 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc @@ -56,20 +56,11 @@ void bind_eye_sink_f(py::module& m) .def("exec_", &eye_sink_f::exec_, D(eye_sink_f, exec_)) - .def("qwidget", &eye_sink_f::qwidget, D(eye_sink_f, qwidget)) - - - // .def("pyqwidget",&eye_sink_f::pyqwidget, - // D(eye_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<eye_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(eye_sink_f, pyqwidget)) + "qwidget", + [](eye_sink_f& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(eye_sink_f, qwidget)) + .def("set_y_axis", &eye_sink_f::set_y_axis, diff --git a/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc index bdb0f9b6a..6ca230c7d 100644 --- a/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/freq_sink_c_python.cc @@ -59,20 +59,10 @@ void bind_freq_sink_c(py::module& m) .def("exec_", &freq_sink_c::exec_, D(freq_sink_c, exec_)) - .def("qwidget", &freq_sink_c::qwidget, D(freq_sink_c, qwidget)) - - - // .def("pyqwidget",&freq_sink_c::pyqwidget, - // D(freq_sink_c,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<freq_sink_c> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(freq_sink_c, pyqwidget)) + "qwidget", + [](freq_sink_c& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(freq_sink_c, qwidget)) .def("set_fft_size", diff --git a/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc index 35ac7a5f6..975fadf18 100644 --- a/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/freq_sink_f_python.cc @@ -59,20 +59,10 @@ void bind_freq_sink_f(py::module& m) .def("exec_", &freq_sink_f::exec_, D(freq_sink_f, exec_)) - .def("qwidget", &freq_sink_f::qwidget, D(freq_sink_f, qwidget)) - - - // .def("pyqwidget",&freq_sink_f::pyqwidget, - // D(freq_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<freq_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(freq_sink_f, pyqwidget)) + "qwidget", + [](freq_sink_f& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(freq_sink_f, qwidget)) .def("set_fft_size", diff --git a/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc index f0ff24abc..ca25ab789 100644 --- a/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/histogram_sink_f_python.cc @@ -60,20 +60,12 @@ void bind_histogram_sink_f(py::module& m) .def("exec_", &histogram_sink_f::exec_, D(histogram_sink_f, exec_)) - .def("qwidget", &histogram_sink_f::qwidget, D(histogram_sink_f, qwidget)) - - - // .def("pyqwidget",&histogram_sink_f::pyqwidget, - // D(histogram_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<histogram_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](histogram_sink_f& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(histogram_sink_f, pyqwidget)) + D(histogram_sink_f, qwidget)) .def("title", &histogram_sink_f::title, D(histogram_sink_f, title)) diff --git a/gr-qtgui/python/qtgui/bindings/number_sink_python.cc b/gr-qtgui/python/qtgui/bindings/number_sink_python.cc index 8d7c4c361..c172806b3 100644 --- a/gr-qtgui/python/qtgui/bindings/number_sink_python.cc +++ b/gr-qtgui/python/qtgui/bindings/number_sink_python.cc @@ -57,20 +57,10 @@ void bind_number_sink(py::module& m) .def("exec_", &number_sink::exec_, D(number_sink, exec_)) - .def("qwidget", &number_sink::qwidget, D(number_sink, qwidget)) - - - // .def("pyqwidget",&number_sink::pyqwidget, - // D(number_sink,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<number_sink> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(number_sink, pyqwidget)) + "qwidget", + [](number_sink& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(number_sink, qwidget)) .def("set_update_time", diff --git a/gr-qtgui/python/qtgui/bindings/sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/sink_c_python.cc index 39315217f..c76540817 100644 --- a/gr-qtgui/python/qtgui/bindings/sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/sink_c_python.cc @@ -59,18 +59,10 @@ void bind_sink_c(py::module& m) .def("exec_", &sink_c::exec_, D(sink_c, exec_)) - .def("qwidget", &sink_c::qwidget, D(sink_c, qwidget)) - - - // .def("pyqwidget",&sink_c::pyqwidget, - // D(sink_c,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<sink_c> p) { return PyLong_AsLongLong(p->pyqwidget()); }, - D(sink_c, pyqwidget)) + "qwidget", + [](sink_c& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(sink_c, qwidget)) .def("set_fft_size", diff --git a/gr-qtgui/python/qtgui/bindings/sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/sink_f_python.cc index e2635b72b..3d4473ca5 100644 --- a/gr-qtgui/python/qtgui/bindings/sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/sink_f_python.cc @@ -59,18 +59,10 @@ void bind_sink_f(py::module& m) .def("exec_", &sink_f::exec_, D(sink_f, exec_)) - .def("qwidget", &sink_f::qwidget, D(sink_f, qwidget)) - - - // .def("pyqwidget",&sink_f::pyqwidget, - // D(sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<sink_f> p) { return PyLong_AsLongLong(p->pyqwidget()); }, - D(sink_f, pyqwidget)) + "qwidget", + [](sink_f& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(sink_f, qwidget)) .def("set_fft_size", diff --git a/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc b/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc index 8e4de7f44..2fb84e3e4 100644 --- a/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_raster_sink_b_python.cc @@ -61,20 +61,13 @@ void bind_time_raster_sink_b(py::module& m) .def("exec_", &time_raster_sink_b::exec_, D(time_raster_sink_b, exec_)) - .def("qwidget", &time_raster_sink_b::qwidget, D(time_raster_sink_b, qwidget)) - - - // .def("pyqwidget",&time_raster_sink_b::pyqwidget, - // D(time_raster_sink_b,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<time_raster_sink_b> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](time_raster_sink_b& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(time_raster_sink_b, pyqwidget)) + D(time_raster_sink_b, qwidget)) + .def("set_x_range", &time_raster_sink_b::set_x_range, diff --git a/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc index 4665015ee..539b97bce 100644 --- a/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_raster_sink_f_python.cc @@ -61,20 +61,13 @@ void bind_time_raster_sink_f(py::module& m) .def("exec_", &time_raster_sink_f::exec_, D(time_raster_sink_f, exec_)) - .def("qwidget", &time_raster_sink_f::qwidget, D(time_raster_sink_f, qwidget)) - - - // .def("pyqwidget",&time_raster_sink_f::pyqwidget, - // D(time_raster_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<time_raster_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](time_raster_sink_f& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(time_raster_sink_f, pyqwidget)) + D(time_raster_sink_f, qwidget)) + .def("set_x_range", &time_raster_sink_f::set_x_range, diff --git a/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc index f28614f92..41bec6211 100644 --- a/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_sink_c_python.cc @@ -60,20 +60,11 @@ void bind_time_sink_c(py::module& m) .def("exec_", &time_sink_c::exec_, D(time_sink_c, exec_)) - .def("qwidget", &time_sink_c::qwidget, D(time_sink_c, qwidget)) - - - // .def("pyqwidget",&time_sink_c::pyqwidget, - // D(time_sink_c,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<time_sink_c> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(time_sink_c, pyqwidget)) + "qwidget", + [](time_sink_c& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(time_sink_c, qwidget)) + .def("set_y_axis", &time_sink_c::set_y_axis, diff --git a/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc index 20d65ac78..e7cd5673e 100644 --- a/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/time_sink_f_python.cc @@ -57,20 +57,11 @@ void bind_time_sink_f(py::module& m) .def("exec_", &time_sink_f::exec_, D(time_sink_f, exec_)) - .def("qwidget", &time_sink_f::qwidget, D(time_sink_f, qwidget)) - - - // .def("pyqwidget",&time_sink_f::pyqwidget, - // D(time_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<time_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); - }, - D(time_sink_f, pyqwidget)) + "qwidget", + [](time_sink_f& self) { return reinterpret_cast<uintptr_t>(self.qwidget()); }, + D(time_sink_f, qwidget)) + .def("set_y_axis", &time_sink_f::set_y_axis, diff --git a/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc index be616dd18..f5b85e425 100644 --- a/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/vector_sink_f_python.cc @@ -60,20 +60,12 @@ void bind_vector_sink_f(py::module& m) .def("exec_", &vector_sink_f::exec_, D(vector_sink_f, exec_)) - .def("qwidget", &vector_sink_f::qwidget, D(vector_sink_f, qwidget)) - - - // .def("pyqwidget",&time_sink_c::pyqwidget, - // D(vector_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<vector_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](vector_sink_f& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(vector_sink_f, pyqwidget)) + D(vector_sink_f, qwidget)) .def("vlen", &vector_sink_f::vlen, D(vector_sink_f, vlen)) diff --git a/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc index 240bcefbe..73c04ab2f 100644 --- a/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/waterfall_sink_c_python.cc @@ -60,20 +60,12 @@ void bind_waterfall_sink_c(py::module& m) .def("exec_", &waterfall_sink_c::exec_, D(waterfall_sink_c, exec_)) - .def("qwidget", &waterfall_sink_c::qwidget, D(waterfall_sink_c, qwidget)) - - - // .def("pyqwidget",&waterfall_sink_c::pyqwidget, - // D(waterfall_sink_c,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<waterfall_sink_c> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](waterfall_sink_c& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(waterfall_sink_c, pyqwidget)) + D(waterfall_sink_c, qwidget)) .def("clear_data", &waterfall_sink_c::clear_data, D(waterfall_sink_c, clear_data)) diff --git a/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc index c3a48d6a3..434f8ea87 100644 --- a/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/waterfall_sink_f_python.cc @@ -60,20 +60,13 @@ void bind_waterfall_sink_f(py::module& m) .def("exec_", &waterfall_sink_f::exec_, D(waterfall_sink_f, exec_)) - .def("qwidget", &waterfall_sink_f::qwidget, D(waterfall_sink_f, qwidget)) - - - // .def("pyqwidget",&waterfall_sink_f::pyqwidget, - // D(waterfall_sink_f,pyqwidget) - // ) - // For the sip conversion to python to work, the widget object - // needs to be explicitly converted to long long. .def( - "pyqwidget", - [](std::shared_ptr<waterfall_sink_f> p) { - return PyLong_AsLongLong(p->pyqwidget()); + "qwidget", + [](waterfall_sink_f& self) { + return reinterpret_cast<uintptr_t>(self.qwidget()); }, - D(waterfall_sink_f, pyqwidget)) + D(waterfall_sink_f, qwidget)) + .def("clear_data", &waterfall_sink_f::clear_data, D(waterfall_sink_f, clear_data)) |