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 | |
| parent | b3de331436bfda3aa30575db698d181ee5d406f7 (diff) | |
gr-qtgui: Repair qtgui examples for pybind11.
Diffstat (limited to 'gr-qtgui')
26 files changed, 118 insertions, 68 deletions
diff --git a/gr-qtgui/examples/pyqt_const_c.py b/gr-qtgui/examples/pyqt_const_c.py index a02deb78a1..d027206dd1 100644 --- a/gr-qtgui/examples/pyqt_const_c.py +++ b/gr-qtgui/examples/pyqt_const_c.py @@ -141,7 +141,7 @@ class my_top_block(gr.top_block): src = blocks.add_cc() channel = channels.channel_model(0.001) thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) - self.snk1 = qtgui.const_sink_c(npts, "Constellation Example", 1) + self.snk1 = qtgui.const_sink_c(npts, "Constellation Example", 1, None) self.snk1.disable_legend() self.connect(src1, (src,0)) diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index 675101c5a9..6e03138cdc 100644 --- a/gr-qtgui/examples/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py @@ -149,7 +149,7 @@ class my_top_block(gr.top_block): self.snk1 = qtgui.sink_c(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Signal Example", - True, True, True, False) + True, True, True, False, None) self.connect(src1, (src,0)) self.connect(src2, (src,1)) diff --git a/gr-qtgui/examples/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py index 16d0f02681..b5099e581f 100644 --- a/gr-qtgui/examples/pyqt_example_f.py +++ b/gr-qtgui/examples/pyqt_example_f.py @@ -140,7 +140,7 @@ class my_top_block(gr.top_block): self.snk1 = qtgui.sink_f(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, "Float Signal Example", - True, True, True, False) + True, True, True, False, None) self.connect(src1, (src,0)) self.connect(src2, (src,1)) diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py index 3a7d57c93b..52523cd102 100644 --- a/gr-qtgui/examples/pyqt_freq_c.py +++ b/gr-qtgui/examples/pyqt_freq_c.py @@ -148,7 +148,7 @@ class my_top_block(gr.top_block): thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) self.snk1 = qtgui.freq_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, - "Complex Freq Example", 3) + "Complex Freq Example", 3, None) self.connect(src1, (src,0)) self.connect(src2, (src,1)) diff --git a/gr-qtgui/examples/pyqt_freq_f.py b/gr-qtgui/examples/pyqt_freq_f.py index 1059b967a7..fe72a73d59 100644 --- a/gr-qtgui/examples/pyqt_freq_f.py +++ b/gr-qtgui/examples/pyqt_freq_f.py @@ -138,7 +138,7 @@ class my_top_block(gr.top_block): thr = blocks.throttle(gr.sizeof_float, 100*npts) self.snk1 = qtgui.freq_sink_f(npts, filter.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, - "Real freq Example", 3) + "Real freq Example", 3, None) self.connect(src1, (src,0)) self.connect(src2, (src,1)) diff --git a/gr-qtgui/examples/pyqt_histogram_f.py b/gr-qtgui/examples/pyqt_histogram_f.py index 5a7627475d..820db37820 100644 --- a/gr-qtgui/examples/pyqt_histogram_f.py +++ b/gr-qtgui/examples/pyqt_histogram_f.py @@ -154,7 +154,7 @@ class my_top_block(gr.top_block): src = blocks.add_ff() thr = blocks.throttle(gr.sizeof_float, 100*npts) self.snk1 = qtgui.histogram_sink_f(npts, 200, -5, 5, - "Histogram") + "Histogram", 1, None) self.snk1.disable_legend() self.connect(src1, (src,0)) diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py index d8a177eb4d..80dd3f8e05 100644 --- a/gr-qtgui/examples/pyqt_time_c.py +++ b/gr-qtgui/examples/pyqt_time_c.py @@ -147,7 +147,7 @@ class my_top_block(gr.top_block): channel = channels.channel_model(0.01) thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) self.snk1 = qtgui.time_sink_c(npts, Rs, - "Complex Time Example", 1) + "Complex Time Example", 1, None) self.connect(src1, (src,0)) self.connect(src2, (src,1)) diff --git a/gr-qtgui/examples/pyqt_time_f.py b/gr-qtgui/examples/pyqt_time_f.py index 8f0d7a6e99..34ca6ca9e2 100644 --- a/gr-qtgui/examples/pyqt_time_f.py +++ b/gr-qtgui/examples/pyqt_time_f.py @@ -138,7 +138,7 @@ class my_top_block(gr.top_block): noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001) add = blocks.add_ff() self.snk1 = qtgui.time_sink_f(npts, Rs, - "Complex Time Example", 3) + "Complex Time Example", 3, None) self.connect(src1, (src,0)) self.connect(src2, (src,1)) diff --git a/gr-qtgui/examples/pyqt_time_raster_b.py b/gr-qtgui/examples/pyqt_time_raster_b.py index b57e0592c8..cb136998a7 100644 --- a/gr-qtgui/examples/pyqt_time_raster_b.py +++ b/gr-qtgui/examples/pyqt_time_raster_b.py @@ -54,7 +54,7 @@ class my_top_block(gr.top_block): thr = blocks.throttle(gr.sizeof_char, 50000) head = blocks.head(gr.sizeof_char, 10000000) self.snk1 = qtgui.time_raster_sink_b(fs, nrows, ncols, [], [], - "Time Raster Example", 2) + "Time Raster Example", 2, None) self.connect(src0, thr, (self.snk1, 0)) self.connect(src1, (self.snk1, 1)) diff --git a/gr-qtgui/examples/pyqt_time_raster_f.py b/gr-qtgui/examples/pyqt_time_raster_f.py index a80bde5351..649bed1db4 100644 --- a/gr-qtgui/examples/pyqt_time_raster_f.py +++ b/gr-qtgui/examples/pyqt_time_raster_f.py @@ -53,7 +53,7 @@ class my_top_block(gr.top_block): thr = blocks.throttle(gr.sizeof_float, 50000) hed = blocks.head(gr.sizeof_float, 10000000) self.snk1 = qtgui.time_raster_sink_f(fs, nrows, ncols, [], [], - "Float Time Raster Example", 2) + "Float Time Raster Example", 2, None) self.connect(src0, thr, (self.snk1, 0)) self.connect(src1, (self.snk1, 1)) diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py index 9d5ff333bb..0a24641b96 100644 --- a/gr-qtgui/examples/pyqt_waterfall_c.py +++ b/gr-qtgui/examples/pyqt_waterfall_c.py @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): filt = filter.fft_filter_ccc(1, taps) self.snk1 = qtgui.waterfall_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, - "Complex Waterfall Example", 2) + "Complex Waterfall Example", 2, None) self.snk1.set_color_map(0, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) self.snk1.set_color_map(1, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) diff --git a/gr-qtgui/examples/pyqt_waterfall_f.py b/gr-qtgui/examples/pyqt_waterfall_f.py index 401fc81333..3b9b779a7e 100644 --- a/gr-qtgui/examples/pyqt_waterfall_f.py +++ b/gr-qtgui/examples/pyqt_waterfall_f.py @@ -137,7 +137,7 @@ class my_top_block(gr.top_block): thr = blocks.throttle(gr.sizeof_float, 100*npts) self.snk1 = qtgui.waterfall_sink_f(npts, filter.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, - "Real Waterfall Example", 2) + "Real Waterfall Example", 2, None) self.snk1.set_color_map(0, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) self.snk1.set_color_map(1, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) diff --git a/gr-qtgui/grc/qtgui_eye_sink_x.block.yml b/gr-qtgui/grc/qtgui_eye_sink_x.block.yml index 4bc0c21d3e..7af8843ac5 100644 --- a/gr-qtgui/grc/qtgui_eye_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_eye_sink_x.block.yml @@ -953,7 +953,8 @@ templates: ${size}, #size ${srate}, #samp_rate ${name}, #name - ${0 if type.startswith('msg') else nconnections} #number of inputs + ${0 if type.startswith('msg') else nconnections}, #number of inputs + None ) self.${id}.set_update_time(${update_time}) self.${id}.set_samp_per_symbol(${samp_per_symbol}) diff --git a/gr-qtgui/grc/qtgui_time_raster_x.block.yml b/gr-qtgui/grc/qtgui_time_raster_x.block.yml index 5a062d053e..3f1733069e 100644 --- a/gr-qtgui/grc/qtgui_time_raster_x.block.yml +++ b/gr-qtgui/grc/qtgui_time_raster_x.block.yml @@ -235,7 +235,8 @@ templates: ${mult}, ${offset}, ${name}, - ${0 if type.startswith('msg') else nconnections} + ${0 if type.startswith('msg') else nconnections}, + None ) self.${id}.set_update_time(${update_time}) diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 4da40fcd47..b422a1220c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -1035,16 +1035,28 @@ signals: public slots: void getMultiColor() { - emit whichTrigger(d_which, INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR); + emit whichTrigger(d_which, gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR); + } + void getWhiteHot() + { + emit whichTrigger(d_which, gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT); + } + void getBlackHot() + { + emit whichTrigger(d_which, gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT); } - void getWhiteHot() { emit whichTrigger(d_which, INTENSITY_COLOR_MAP_TYPE_WHITE_HOT); } - void getBlackHot() { emit whichTrigger(d_which, INTENSITY_COLOR_MAP_TYPE_BLACK_HOT); } void getIncandescent() { - emit whichTrigger(d_which, INTENSITY_COLOR_MAP_TYPE_INCANDESCENT); + emit whichTrigger(d_which, gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT); + } + void getSunset() + { + emit whichTrigger(d_which, gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET); + } + void getCool() + { + emit whichTrigger(d_which, gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL); } - void getSunset() { emit whichTrigger(d_which, INTENSITY_COLOR_MAP_TYPE_SUNSET); } - void getCool() { emit whichTrigger(d_which, INTENSITY_COLOR_MAP_TYPE_COOL); } // void getOther(d_which, const QString &min_str, const QString &max_str) void getOther() { @@ -1056,8 +1068,10 @@ public slots: d_min_value = QColorDialog::getColor(d_min_value, this); d_max_value = QColorDialog::getColor(d_max_value, this); - emit whichTrigger( - d_which, INTENSITY_COLOR_MAP_TYPE_USER_DEFINED, d_min_value, d_max_value); + emit whichTrigger(d_which, + gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED, + d_min_value, + d_max_value); } private: diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h index 8de67c05f5..a0ed7339a3 100644 --- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h +++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h @@ -121,11 +121,7 @@ enum graph_t { NUM_GRAPH_VERT, }; -} /* namespace qtgui */ -} /* namespace gr */ - - -enum { +enum intensity_t { INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0, INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1, INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2, @@ -135,6 +131,10 @@ enum { INTENSITY_COLOR_MAP_TYPE_COOL = 6, }; +} /* namespace qtgui */ +} /* namespace gr */ + + class ColorMap_MultiColor : public QwtLinearColorMap { public: diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 887bc8c7c0..27bc1f5c89 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -194,7 +194,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot( d_raster[i]->attach(this); - d_color_map_type.push_back(INTENSITY_COLOR_MAP_TYPE_BLACK_HOT); + d_color_map_type.push_back(gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT); setAlpha(i, 255 / d_nplots); } @@ -221,8 +221,10 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot( // We've made sure the old type is different than here so we'll // force and update. for (unsigned int i = 0; i < d_nplots; ++i) { - setIntensityColorMapType( - i, INTENSITY_COLOR_MAP_TYPE_WHITE_HOT, QColor("white"), QColor("white")); + setIntensityColorMapType(i, + gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT, + QColor("white"), + QColor("white")); } _updateIntensityRangeDisplay(); @@ -446,10 +448,10 @@ void TimeRasterDisplayPlot::setIntensityColorMapType(const unsigned int which, "TimerasterDisplayPlot::setIntesityColorMap: invalid which."); if ((d_color_map_type[which] != newType) || - ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && + ((newType == gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && (lowColor.isValid() && highColor.isValid()))) { switch (newType) { - case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: { d_color_map_type[which] = newType; d_raster[which]->setColorMap(new ColorMap_MultiColor()); @@ -457,32 +459,32 @@ void TimeRasterDisplayPlot::setIntensityColorMapType(const unsigned int which, d_zoomer->setTrackerPen(QColor(Qt::black)); break; } - case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: { d_color_map_type[which] = newType; d_raster[which]->setColorMap(new ColorMap_WhiteHot()); break; } - case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: { d_color_map_type[which] = newType; d_raster[which]->setColorMap(new ColorMap_BlackHot()); break; } - case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: { d_color_map_type[which] = newType; d_raster[which]->setColorMap(new ColorMap_Incandescent()); break; } - case INTENSITY_COLOR_MAP_TYPE_SUNSET: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET: { d_color_map_type[which] = newType; d_raster[which]->setColorMap(new ColorMap_Sunset()); break; } - case INTENSITY_COLOR_MAP_TYPE_COOL: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL: { d_color_map_type[which] = newType; d_raster[which]->setColorMap(new ColorMap_Cool()); break; } - case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: { d_low_intensity = lowColor; d_high_intensity = highColor; d_color_map_type[which] = newType; @@ -529,25 +531,25 @@ void TimeRasterDisplayPlot::_updateIntensityRangeDisplay() #else QwtInterval intv = d_raster[i]->interval(Qt::ZAxis); switch (d_color_map_type[i]) { - case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: rightAxis->setColorMap(intv, new ColorMap_MultiColor()); break; - case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: rightAxis->setColorMap(intv, new ColorMap_WhiteHot()); break; - case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: rightAxis->setColorMap(intv, new ColorMap_BlackHot()); break; - case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: rightAxis->setColorMap(intv, new ColorMap_Incandescent()); break; - case INTENSITY_COLOR_MAP_TYPE_SUNSET: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET: rightAxis->setColorMap(intv, new ColorMap_Sunset()); break; - case INTENSITY_COLOR_MAP_TYPE_COOL: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL: rightAxis->setColorMap(intv, new ColorMap_Cool()); break; - case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: rightAxis->setColorMap( intv, new ColorMap_UserDefined(d_low_intensity, d_high_intensity)); break; diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index 166ff5a16e..f2068621dd 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -146,7 +146,8 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget* parent) d_spectrogram[i]->attach(this); - d_intensity_color_map_type.push_back(INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR); + d_intensity_color_map_type.push_back( + gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR); setIntensityColorMapType( i, d_intensity_color_map_type[i], QColor("white"), QColor("white")); @@ -435,10 +436,10 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, const QColor highColor) { if ((d_intensity_color_map_type[which] != newType) || - ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && + ((newType == gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && (lowColor.isValid() && highColor.isValid()))) { switch (newType) { - case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: { d_intensity_color_map_type[which] = newType; #if QWT_VERSION < 0x060000 ColorMap_MultiColor colorMap; @@ -448,7 +449,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, #endif break; } - case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: { d_intensity_color_map_type[which] = newType; #if QWT_VERSION < 0x060000 ColorMap_WhiteHot colorMap; @@ -458,7 +459,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, #endif break; } - case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: { d_intensity_color_map_type[which] = newType; #if QWT_VERSION < 0x060000 ColorMap_BlackHot colorMap; @@ -468,7 +469,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, #endif break; } - case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: { d_intensity_color_map_type[which] = newType; #if QWT_VERSION < 0x060000 ColorMap_Incandescent colorMap; @@ -478,7 +479,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, #endif break; } - case INTENSITY_COLOR_MAP_TYPE_SUNSET: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET: { d_intensity_color_map_type[which] = newType; #if QWT_VERSION < 0x060000 ColorMap_Sunset colorMap; @@ -488,7 +489,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, #endif break; } - case INTENSITY_COLOR_MAP_TYPE_COOL: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL: { d_intensity_color_map_type[which] = newType; #if QWT_VERSION < 0x060000 ColorMap_Cool colorMap; @@ -498,7 +499,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, #endif break; } - case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: { + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: { d_user_defined_low_intensity_color = lowColor; d_user_defined_high_intensity_color = highColor; d_intensity_color_map_type[which] = newType; @@ -582,25 +583,25 @@ void WaterfallDisplayPlot::_updateIntensityRangeDisplay() #else QwtInterval intv = d_spectrogram[i]->interval(Qt::ZAxis); switch (d_intensity_color_map_type[i]) { - case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: rightAxis->setColorMap(intv, new ColorMap_MultiColor()); break; - case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: rightAxis->setColorMap(intv, new ColorMap_WhiteHot()); break; - case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: rightAxis->setColorMap(intv, new ColorMap_BlackHot()); break; - case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: rightAxis->setColorMap(intv, new ColorMap_Incandescent()); break; - case INTENSITY_COLOR_MAP_TYPE_SUNSET: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET: rightAxis->setColorMap(intv, new ColorMap_Sunset()); break; - case INTENSITY_COLOR_MAP_TYPE_COOL: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL: rightAxis->setColorMap(intv, new ColorMap_Cool()); break; - case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: + case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: rightAxis->setColorMap( intv, new ColorMap_UserDefined(d_user_defined_low_intensity_color, diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 21727bec92..34c3b7d72d 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -638,7 +638,7 @@ void SpectrumDisplayForm::waterfallIntensityColorTypeChanged(int newType) { QColor lowIntensityColor; QColor highIntensityColor; - if (newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) { + if (newType == gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) { // Select the Low Intensity Color lowIntensityColor = _waterfallDisplayPlot->getUserDefinedLowIntensityColor(); if (!lowIntensityColor.isValid()) { 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(); } |