diff options
| author | Volker Schroer <3470424+dl1ksv@users.noreply.github.com> | 2020-11-26 14:16:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-26 08:16:58 -0500 |
| commit | 08d4dbd5b8a5f297065f2806a5d4b4929e910c9c (patch) | |
| tree | 5c50966e30ea3115f5e6dba23abd344330a26f93 | |
| parent | f72e68a153d6f6a3a5363a2c95398a44f4004793 (diff) | |
qtgui: Resize the windows properly in gui sink
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/displayform.h | 1 | ||||
| -rw-r--r-- | gr-qtgui/lib/displayform.cc | 6 | ||||
| -rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.cc | 15 | ||||
| -rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.ui | 26 |
4 files changed, 26 insertions, 22 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index 31671e1cae..eaebbf313e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -41,7 +41,6 @@ public: void enableMenu(bool en = true); public slots: - void resizeEvent(QResizeEvent* e) override; void mousePressEvent(QMouseEvent* e) override; void customEvent(QEvent* e) override = 0; diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index 8ca3f65579..b8a4b34efb 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -144,12 +144,6 @@ DisplayForm::~DisplayForm() // deleted } -void DisplayForm::resizeEvent(QResizeEvent* e) -{ - // QSize s = size(); - // emit d_display_plot->resizeSlot(&s); -} - void DisplayForm::mousePressEvent(QMouseEvent* e) { bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers(); diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 34c3b7d72d..17c9ddc252 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -316,6 +316,15 @@ void SpectrumDisplayForm::newFrequencyData(const SpectrumUpdateEvent* spectrumUp void SpectrumDisplayForm::resizeEvent(QResizeEvent* e) { QSize s; + s.setWidth(e->size().width() - 40); + s.setHeight(e->size().height() - 160); + TimeDomainDisplayFrame->resize(s); + ConstellationDisplayFrame->resize(s); + s.setHeight(e->size().height() - 205); + FrequencyPlotDisplayFrame->resize(s); + s.setHeight(e->size().height() - 240); + WaterfallPlotDisplayFrame->resize(s); + s.setWidth(FrequencyPlotDisplayFrame->width()); s.setHeight(FrequencyPlotDisplayFrame->height()); emit _frequencyDisplayPlot->resizeSlot(&s); @@ -409,11 +418,7 @@ void SpectrumDisplayForm::maxHoldResetBtn_clicked() } -void SpectrumDisplayForm::tabChanged(int index) -{ - // This might be dangerous to call this with NULL - resizeEvent(NULL); -} +void SpectrumDisplayForm::tabChanged(int index) { update(); } void SpectrumDisplayForm::setFrequencyRange(const double newCenterFrequency, const double newStartFrequency, diff --git a/gr-qtgui/lib/spectrumdisplayform.ui b/gr-qtgui/lib/spectrumdisplayform.ui index 1176aec4de..3a5c68fc41 100644 --- a/gr-qtgui/lib/spectrumdisplayform.ui +++ b/gr-qtgui/lib/spectrumdisplayform.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>712</width> - <height>560</height> + <height>575</height> </rect> </property> <property name="windowTitle"> @@ -163,7 +163,7 @@ <item row="0" column="0" colspan="4"> <widget class="QTabWidget" name="SpectrumTypeTab"> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> <widget class="QWidget" name="FrequencyPage"> <attribute name="title"> @@ -304,7 +304,7 @@ <widget class="QLabel" name="textLabel1"> <property name="maximumSize"> <size> - <width>130</width> + <width>170</width> <height>16777215</height> </size> </property> @@ -330,7 +330,10 @@ <property name="focusPolicy"> <enum>Qt::ClickFocus</enum> </property> - <property name="valid"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="valid" stdset="0"> <bool>true</bool> </property> </widget> @@ -375,15 +378,18 @@ <height>0</height> </size> </property> - <property name="valid"> - <bool>true</bool> - </property> <property name="mouseTracking"> <bool>true</bool> </property> <property name="focusPolicy"> <enum>Qt::ClickFocus</enum> </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="valid" stdset="0"> + <bool>true</bool> + </property> </widget> </item> <item row="2" column="3"> @@ -406,7 +412,7 @@ <widget class="QPushButton" name="WaterfallAutoScaleBtn"> <property name="maximumSize"> <size> - <width>80</width> + <width>100</width> <height>16777215</height> </size> </property> @@ -517,11 +523,11 @@ </widget> <layoutdefault spacing="6" margin="11"/> <customwidgets> - <customwidget> + <customwidget> <class>QwtSlider</class> <extends>QWidget</extends> <header>qwt_slider.h</header> - </customwidget> + </customwidget> </customwidgets> <tabstops> <tabstop>SpectrumTypeTab</tabstop> |