diff options
| author | Volker Schroer <3470424+dl1ksv@users.noreply.github.com> | 2021-06-05 18:52:30 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-06-21 07:48:34 -0400 |
| commit | 06b7d1a8d5c8b6879f114721a9e968e44a15a3ee (patch) | |
| tree | a9f5538615e5d9418a7894609fd09aab41df170c | |
| parent | 8093f579eb0e159a14f8f44aad67780ffd3cc8bd (diff) | |
gr-qtgui: cpp generation:position windows correctly depending on gui_hint
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
| -rw-r--r-- | gr-qtgui/grc/qtgui_entry.block.yml | 6 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_freq_sink_x.block.yml | 5 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_sink_x.block.yml | 6 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml | 5 |
4 files changed, 20 insertions, 2 deletions
diff --git a/gr-qtgui/grc/qtgui_entry.block.yml b/gr-qtgui/grc/qtgui_entry.block.yml index 66e4b31b98..15f026109d 100644 --- a/gr-qtgui/grc/qtgui_entry.block.yml +++ b/gr-qtgui/grc/qtgui_entry.block.yml @@ -69,7 +69,11 @@ cpp_templates: QObject::connect(this->_${id}_line_edit, &QLineEdit::returnPressed, this, [this] () {this->set_${id}(this->_${id}_line_edit->text().toInt());}); this->top_layout->addWidget(this->_${id}_tool_bar); - + % if len(gui_hint) > 0: + this->top_grid_layout->addWidget(this->_${id}_tool_bar,${gui_hint}); + % else: + this->top_layout->addWidget(this->_${id}_tool_bar); + % endif documentation: |- This block creates a variable with a text entry box. Leave the label blank to use the variable id as the label. diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml index 76a6a206ba..b35603b160 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml @@ -516,7 +516,12 @@ cpp_templates: } _${id}_win = this->${id}->qwidget(); + % if len(gui_hint) > 0: + this->top_grid_layout->addWidget(_${id}_win,${gui_hint}); + % else: this->top_layout->addWidget(_${id}_win); + % endif + translations: firdes.: 'filter::firdes::' 'True': 'true' diff --git a/gr-qtgui/grc/qtgui_sink_x.block.yml b/gr-qtgui/grc/qtgui_sink_x.block.yml index fd0a479102..64e85e84c3 100644 --- a/gr-qtgui/grc/qtgui_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_sink_x.block.yml @@ -149,7 +149,11 @@ cpp_templates: ${id}->set_update_time(1.0/${rate}); ${id}->enable_rf_freq(${showrf}); ## Attempt to replicate logic of Python gui_hint() method - this->top_grid_layout->addWidget(${id + '->qwidget()' + (', ' + str(gui_hint)[1:-1] if len(gui_hint) > 2 else '')}); + % if len(gui_hint) > 0: + this->top_grid_layout->addWidget(${id + '->qwidget()'},${gui_hint}); + % else: + this->top_layout->addWidget(${id + '->qwidget()'}); + % endif link: ['gnuradio::gnuradio-qtgui', 'Qt5Widgets', 'Qt5Core'] translations: diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml index 4ba41a2e34..88358465e6 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml @@ -353,7 +353,12 @@ cpp_templates: this->${id}->set_intensity_range(${int_min}, ${int_max}); _${id}_win = this->${id}->qwidget(); + % if len(gui_hint) > 0: + this->top_grid_layout->addWidget(_${id}_win,${gui_hint}); + % else: this->top_layout->addWidget(_${id}_win); + % endif + translations: firdes.: 'filter::firdes::' 'True': 'true' |