diff options
author | Ron Economos <w6rz@comcast.net> | 2020-07-26 06:20:05 -0700 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-07-30 07:25:07 -0400 |
commit | 36c7e557a63966e1b1c493ec98e547ee2ceaf5a1 (patch) | |
tree | e23ed344dca05ee4d1955a55dfff07be907312b9 | |
parent | 3ce759e0c0c9d5ee503c32f0cb91627f424116a3 (diff) |
gr-qtgui: Repair Message Edit Box block for pybind11.
-rw-r--r-- | gr-qtgui/grc/qtgui_edit_box_msg.block.yml | 2 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc | 12 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/bindings/python_bindings.cc | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gr-qtgui/grc/qtgui_edit_box_msg.block.yml b/gr-qtgui/grc/qtgui_edit_box_msg.block.yml index c2ef050122..2b57d4a721 100644 --- a/gr-qtgui/grc/qtgui_edit_box_msg.block.yml +++ b/gr-qtgui/grc/qtgui_edit_box_msg.block.yml @@ -60,7 +60,7 @@ templates: <% win = 'self._%s_win'%id %>\ - qtgui.edit_box_msg(${type.t}, ${value}, ${label}, ${is_pair}, ${is_static}, ${key}) + qtgui.edit_box_msg(${type.t}, ${value}, ${label}, ${is_pair}, ${is_static}, ${key}, None) ${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget) ${gui_hint() % win} 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 17d36ad979..a5d4498a31 100644 --- a/gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc +++ b/gr-qtgui/python/qtgui/bindings/edit_box_msg_python.cc @@ -55,6 +55,18 @@ 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()); + }, + D(edit_box_msg, pyqwidget)) + .def("qwidget", &edit_box_msg::qwidget, D(edit_box_msg, qwidget)) diff --git a/gr-qtgui/python/qtgui/bindings/python_bindings.cc b/gr-qtgui/python/qtgui/bindings/python_bindings.cc index 116873633c..3650a2be89 100644 --- a/gr-qtgui/python/qtgui/bindings/python_bindings.cc +++ b/gr-qtgui/python/qtgui/bindings/python_bindings.cc @@ -99,7 +99,7 @@ PYBIND11_MODULE(qtgui_python, m) bind_const_sink_c(m); // bind_constellationdisplayform(m); // bind_displayform(m); - // bind_edit_box_msg(m); + bind_edit_box_msg(m); bind_eye_sink_c(m); bind_eye_sink_f(m); // bind_form_menus(m); |