diff options
| author | Ron Economos <w6rz@comcast.net> | 2020-07-19 16:08:56 -0700 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-07-22 12:57:10 -0400 |
| commit | c2f42238032e2315371aaec8a64687d99028ccd2 (patch) | |
| tree | 141b0b63cb6eebe7ccd27b01da8832b0d7eca838 /gr-qtgui/python/qtgui | |
| parent | b3de331436bfda3aa30575db698d181ee5d406f7 (diff) | |
gr-qtgui: Repair qtgui examples for pybind11.
Diffstat (limited to 'gr-qtgui/python/qtgui')
7 files changed, 37 insertions, 6 deletions
diff --git a/gr-qtgui/python/qtgui/auto_correlator_sink.py b/gr-qtgui/python/qtgui/auto_correlator_sink.py index 877e60d0ad..5d8024d2d0 100644 --- a/gr-qtgui/python/qtgui/auto_correlator_sink.py +++ b/gr-qtgui/python/qtgui/auto_correlator_sink.py @@ -82,15 +82,15 @@ class AutoCorrelator(gr.hier_block2): fac = fft.fft_vcc(self.fac_size, True, ()) complex2Mag = blocks.complex_to_mag(self.fac_size) - self.avg = filter.single_pole_iir_filter_ff_make(1.0, self.fac_size) + self.avg = filter.single_pole_iir_filter_ff(1.0, self.fac_size) fac_fac = fft.fft_vfc(self.fac_size, True, ()) - fac_c2mag = blocks.complex_to_mag_make(fac_size) + fac_c2mag = blocks.complex_to_mag(fac_size) # There's a note in Baz's block about needing to add 3 dB to each bin but the DC bin, however it was never implemented n = 20 k = -20 * math.log10(self.fac_size) - log = blocks.nlog10_ff_make(n, self.fac_size, k) + log = blocks.nlog10_ff(n, self.fac_size, k) if use_db: self.connect(self, streamToVec, self.one_in_n, fac, complex2Mag, fac_fac, fac_c2mag, self.avg, log, self) @@ -114,7 +114,7 @@ class AutoCorrelatorSink(gr.hier_block2): autoCorr = AutoCorrelator(sample_rate, fac_size, fac_decimation, use_db) vecToStream = blocks.vector_to_stream(gr.sizeof_float, self.fac_size) - self.timeSink = qtgui.time_sink_f(self.fac_size/2, sample_rate, title, 1) + self.timeSink = qtgui.time_sink_f(self.fac_size//2, sample_rate, title, 1, None) self.timeSink.enable_grid(grid) self.timeSink.set_y_axis(yMin, yMax) self.timeSink.enable_autoscale(autoScale) 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 ae461f5548..fa316e63e7 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 @@ -69,6 +69,9 @@ static const char* __doc_gr_qtgui_eye_sink_c_set_nsamps = R"doc()doc"; static const char* __doc_gr_qtgui_eye_sink_c_set_samp_rate = R"doc()doc"; +static const char* __doc_gr_qtgui_eye_sink_c_set_samp_per_symbol = R"doc()doc"; + + static const char* __doc_gr_qtgui_eye_sink_c_set_line_alpha = 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 4ffa10e909..d90195d9f7 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 @@ -69,6 +69,9 @@ static const char* __doc_gr_qtgui_eye_sink_f_set_nsamps = R"doc()doc"; static const char* __doc_gr_qtgui_eye_sink_f_set_samp_rate = R"doc()doc"; +static const char* __doc_gr_qtgui_eye_sink_f_set_samp_per_symbol = R"doc()doc"; + + static const char* __doc_gr_qtgui_eye_sink_f_set_line_alpha = R"doc()doc"; 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 d2962adaa6..388bfaac02 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc @@ -147,6 +147,10 @@ void bind_eye_sink_c(py::module& m) py::arg("samp_rate"), D(eye_sink_c, set_samp_rate)) + .def("set_samp_per_symbol", + &eye_sink_c::set_samp_per_symbol, + py::arg("samp_per_symbol"), + D(eye_sink_c, set_samp_per_symbol)) .def("set_line_alpha", &eye_sink_c::set_line_alpha, 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 fceff081ed..a44f955049 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc @@ -144,6 +144,11 @@ void bind_eye_sink_f(py::module& m) py::arg("samp_rate"), D(eye_sink_f, set_samp_rate)) + .def("set_samp_per_symbol", + &eye_sink_f::set_samp_per_symbol, + py::arg("samp_per_symbol"), + D(eye_sink_f, set_samp_per_symbol)) + .def("set_line_alpha", &eye_sink_f::set_line_alpha, diff --git a/gr-qtgui/python/qtgui/bindings/python_bindings.cc b/gr-qtgui/python/qtgui/bindings/python_bindings.cc index 35bf303cf6..116873633c 100644 --- a/gr-qtgui/python/qtgui/bindings/python_bindings.cc +++ b/gr-qtgui/python/qtgui/bindings/python_bindings.cc @@ -85,6 +85,7 @@ PYBIND11_MODULE(qtgui_python, m) py::module::import("gnuradio.gr"); bind_QWidget(m); + bind_qtgui_types(m); // bind_ConstellationDisplayPlot(m); // bind_DisplayPlot(m); // bind_FrequencyDisplayPlot(m); @@ -108,11 +109,10 @@ PYBIND11_MODULE(qtgui_python, m) // bind_freqdisplayform(m); bind_histogram_sink_f(m); // bind_histogramdisplayform(m); - // bind_number_sink(m); + bind_number_sink(m); // bind_numberdisplayform(m); // // bind_plot_raster(m); // // bind_plot_waterfall(m); - // bind_qtgui_types(m); bind_sink_c(m); bind_sink_f(m); // // bind_spectrumUpdateEvents(m); diff --git a/gr-qtgui/python/qtgui/bindings/qtgui_types_python.cc b/gr-qtgui/python/qtgui/bindings/qtgui_types_python.cc index 2cc5a2d524..e63ca69c2a 100644 --- a/gr-qtgui/python/qtgui/bindings/qtgui_types_python.cc +++ b/gr-qtgui/python/qtgui/bindings/qtgui_types_python.cc @@ -39,4 +39,20 @@ void bind_qtgui_types(py::module& m) .value("NUM_GRAPH_HORIZ", ::gr::qtgui::NUM_GRAPH_HORIZ) // 1 .value("NUM_GRAPH_VERT", ::gr::qtgui::NUM_GRAPH_VERT) // 2 .export_values(); + py::enum_<::gr::qtgui::intensity_t>(m, "intensity_t") + .value("INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR) // 0 + .value("INTENSITY_COLOR_MAP_TYPE_WHITE_HOT", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT) // 1 + .value("INTENSITY_COLOR_MAP_TYPE_BLACK_HOT", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT) // 2 + .value("INTENSITY_COLOR_MAP_TYPE_INCANDESCENT", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT) // 3 + .value("INTENSITY_COLOR_MAP_TYPE_USER_DEFINED", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) // 4 + .value("INTENSITY_COLOR_MAP_TYPE_SUNSET", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET) // 5 + .value("INTENSITY_COLOR_MAP_TYPE_COOL", + ::gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL) // 6 + .export_values(); } |