diff options
| author | Volker Schroer <3470424+dl1ksv@users.noreply.github.com> | 2021-06-05 14:45:37 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-06-21 07:48:34 -0400 |
| commit | 8093f579eb0e159a14f8f44aad67780ffd3cc8bd (patch) | |
| tree | 4df7503fc8a2557461346731a93cff4c1bbbef52 | |
| parent | 4f2da473c30fb5149d23f1d67728c1f08c5ca17d (diff) | |
qt-gui: use the cpp enums for wintype and trigger_type
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
| -rw-r--r-- | gr-qtgui/grc/qtgui_freq_sink_x.block.yml | 6 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_sink_x.block.yml | 2 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml index 73b45bdc1f..76a6a206ba 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml @@ -462,12 +462,12 @@ cpp_templates: - set_frequency_range(${fc}, ${bw}) - set_update_time(${update_time}) - set_y_axis(${ymin}, ${ymax}) - - this->${id}.set_trigger_mode(${tr_mode}, ${tr_level}, ${tr_chan}, ${tr_tag}) + - this->${id}.set_trigger_mode(${tr_mode.replace('qtgui.','gr::qtgui::')}, ${tr_level}, ${tr_chan}, ${tr_tag}) link: ['gnuradio::gnuradio-qtgui', 'Qt5::Widgets'] make: |- this->${id} = qtgui::${type.fcn}::make( ${fftsize}, // size - ${wintype}, // wintype + gr::fft::${wintype.replace('window.', 'window::')}, //wintype ${fc}, // fc ${bw}, // bw ${name}, // name @@ -488,7 +488,7 @@ cpp_templates: this->${id}->set_update_time(${update_time}); this->${id}->set_y_axis(${ymin}, ${ymax}); this->${id}->set_y_label("${label.strip("'")}", "${units.strip("'")}"); - this->${id}->set_trigger_mode(${tr_mode}, ${tr_level}, ${tr_chan}, ${tr_tag}); + this->${id}->set_trigger_mode(${tr_mode.replace('qtgui.','gr::qtgui::')}, ${tr_level}, ${tr_chan}, ${tr_tag}); this->${id}->enable_autoscale(${autoscale}); this->${id}->enable_grid(${grid}); this->${id}->set_fft_average(${average}); diff --git a/gr-qtgui/grc/qtgui_sink_x.block.yml b/gr-qtgui/grc/qtgui_sink_x.block.yml index 33ce6329b9..fd0a479102 100644 --- a/gr-qtgui/grc/qtgui_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_sink_x.block.yml @@ -137,7 +137,7 @@ cpp_templates: make: |- ${id} = gr::qtgui::${type.fcn}::make( ${fftsize}, //fftsize - gr::filter::${wintype.replace('.', '::win_type::')}, //wintype + gr::fft::${wintype.replace('window.', 'window::')}, //wintype ${fc}, //fc ${bw}, //bw ${name}, //name diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml index 4c32ef57f9..4ba41a2e34 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml @@ -311,7 +311,7 @@ cpp_templates: make: |- this->${id} = qtgui::${type.fcn}::make( ${fftsize}, // size - ${wintype}, // wintype + gr::fft::${wintype.replace('window.', 'window::')}, //wintype ${fc}, // fc ${bw}, // bw ${name}, // name |