summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib/histogram_sink_f_impl.h
diff options
context:
space:
mode:
authorDavid Winter <david.winter@analog.com>2021-08-09 13:24:24 +0200
committermormj <34754695+mormj@users.noreply.github.com>2021-09-03 16:12:30 -0400
commit956f332e410331fde426e1485589d905cdf80fb1 (patch)
treec1004bbc58e99afe1ed2daf404d11020626e2980 /gr-qtgui/lib/histogram_sink_f_impl.h
parent4d0f2900e887b87e547a1af5874b5d502b5fc71e (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/histogram_sink_f_impl.h')
-rw-r--r--gr-qtgui/lib/histogram_sink_f_impl.h6
1 files changed, 0 insertions, 6 deletions
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;