VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 05:11:49 -05:00
Code Issues Projects Releases Wiki Activity

Massive UI revamping (v7): fixed widget size handling: sample MIMO. Part of #1209

Browse Source
This commit is contained in:
f4exb 2022-04-21 21:44:57 +02:00
parent f3f504c88d
commit 5a265d7fe3
20 changed files with 187 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp
View File

@ -23,6 +23,7 @@
#include <QString>
#include <QMessageBox>
#include <QFileDialog>
#include <QResizeEvent>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
@ -67,6 +68,7 @@ BladeRF2MIMOGui::BladeRF2MIMOGui(DeviceUISet *deviceUISet, QWidget* parent) :
qDebug("BladeRF2MIMOGui::BladeRF2MIMOGui");
setAttribute(Qt::WA_DeleteOnClose, true);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getContents()->setStyleSheet(QString(tr("#BladeRF2MIMOGui { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/bladerf2mimo/readme.md";
@ -143,6 +145,12 @@ bool BladeRF2MIMOGui::deserialize(const QByteArray& data)
}
}
void BladeRF2MIMOGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void BladeRF2MIMOGui::displaySettings()
{
updateFrequencyLimits();

3
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h
View File

@ -45,6 +45,9 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::BladeRF2MIMOGui* ui;

26
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.ui
View File

@ -6,20 +6,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>360</width>
<height>220</height>
<width>370</width>
<height>208</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<width>370</width>
<height>208</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>208</height>
</size>
</property>
<property name="font">
@ -764,17 +770,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>TransverterButton</class>
<extends>QPushButton</extends>

8
plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp
View File

@ -22,6 +22,7 @@
#include <QString>
#include <QMessageBox>
#include <QFileDialog>
#include <QResizeEvent>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
@ -69,6 +70,7 @@ LimeSDRMIMOGUI::LimeSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) :
qDebug("LimeSDRMIMOGUI::LimeSDRMIMOGUI");
setAttribute(Qt::WA_DeleteOnClose, true);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getContents()->setStyleSheet(QString(tr("#LimeSDRMIMOGUI { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/limesdrmimo/readme.md";
@ -143,6 +145,12 @@ bool LimeSDRMIMOGUI::deserialize(const QByteArray& data)
}
}
void LimeSDRMIMOGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void LimeSDRMIMOGUI::handleInputMessages()
{
Message* message;

3
plugins/samplemimo/limesdrmimo/limesdrmimogui.h
View File

@ -45,6 +45,9 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::LimeSDRMIMOGUI* ui;

32
plugins/samplemimo/limesdrmimo/limesdrmimogui.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>360</width>
<height>286</height>
<width>370</width>
<height>244</height>
</rect>
</property>
<property name="sizePolicy">
@ -18,8 +18,14 @@
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<width>370</width>
<height>244</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>244</height>
</size>
</property>
<property name="font">
@ -1323,6 +1329,11 @@ QToolTip{background-color: white; color: black;}</string>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
@ -1330,21 +1341,16 @@ QToolTip{background-color: white; color: black;}</string>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>TransverterButton</class>
<extends>QPushButton</extends>
<header>gui/transverterbutton.h</header>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ExternalClockButton</class>
<extends>QToolButton</extends>

8
plugins/samplemimo/metismiso/metismisogui.cpp
View File

@ -22,6 +22,7 @@
#include <QString>
#include <QMessageBox>
#include <QFileDialog>
#include <QResizeEvent>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
@ -57,6 +58,7 @@ MetisMISOGui::MetisMISOGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_txSampleRate = 48000;
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getContents()->setStyleSheet(QString(tr("#MetisMISOGui { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/metismiso/readme.md";
@ -106,6 +108,12 @@ void MetisMISOGui::setCenterFrequency(qint64 centerFrequency)
sendSettings();
}
void MetisMISOGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
QByteArray MetisMISOGui::serialize() const
{
return m_settings.serialize();

3
plugins/samplemimo/metismiso/metismisogui.h
View File

@ -46,6 +46,9 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::MetisMISOGui* ui;

20
plugins/samplemimo/metismiso/metismisogui.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>360</width>
<height>234</height>
<height>200</height>
</rect>
</property>
<property name="sizePolicy">
@ -19,7 +19,13 @@
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<height>200</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>360</width>
<height>200</height>
</size>
</property>
<property name="font">
@ -810,17 +816,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>TransverterButton</class>
<extends>QPushButton</extends>

8
plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp
View File

@ -21,6 +21,7 @@
#include <QDateTime>
#include <QString>
#include <QMessageBox>
#include <QResizeEvent>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
@ -69,6 +70,7 @@ PlutoSDRMIMOGUI::PlutoSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) :
qDebug("PlutoSDRMIMOGui::PlutoSDRMIMOGui");
setAttribute(Qt::WA_DeleteOnClose, true);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getContents()->setStyleSheet(QString(tr("#PlutoSDRMIMOGUI { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/plutosdrmimo/readme.md";
@ -146,6 +148,12 @@ bool PlutoSDRMIMOGUI::deserialize(const QByteArray& data)
}
}
void PlutoSDRMIMOGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void PlutoSDRMIMOGUI::displaySettings()
{
if (m_rxElseTx)

3
plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h
View File

@ -45,6 +45,9 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::PlutoSDRMIMOGUI* ui;

26
plugins/samplemimo/plutosdrmimo/plutosdrmimogui.ui
View File

@ -6,20 +6,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>360</width>
<height>319</height>
<width>370</width>
<height>278</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<width>370</width>
<height>278</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>385</width>
<height>278</height>
</size>
</property>
<property name="font">
@ -1260,17 +1266,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>TransverterButton</class>
<extends>QPushButton</extends>

8
plugins/samplemimo/testmi/testmigui.cpp
View File

@ -22,6 +22,7 @@
#include <QString>
#include <QMessageBox>
#include <QFileDialog>
#include <QResizeEvent>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
@ -62,6 +63,7 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_deviceSampleRates.push_back(m_settings.m_streams[1].m_sampleRate / (1<<m_settings.m_streams[1].m_log2Decim));
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getContents()->setStyleSheet(QString(tr("#TestMIGui { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/testmi/readme.md";
@ -124,6 +126,12 @@ bool TestMIGui::deserialize(const QByteArray& data)
}
}
void TestMIGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void TestMIGui::on_startStop_toggled(bool checked)
{
if (m_doApplySettings)

3
plugins/samplemimo/testmi/testmigui.h
View File

@ -46,6 +46,9 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::TestMIGui* ui;

26
plugins/samplemimo/testmi/testmigui.ui
View File

@ -6,20 +6,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>360</width>
<height>368</height>
<width>370</width>
<height>297</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<width>370</width>
<height>297</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>297</height>
</size>
</property>
<property name="font">
@ -1057,17 +1063,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>

1
plugins/samplemimo/testmosync/testmosyncgui.cpp
View File

@ -52,6 +52,7 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) :
{
setAttribute(Qt::WA_DeleteOnClose, true);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
getContents()->setStyleSheet(QString(tr("#TestMOSyncGui { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/testmosync/readme.md";

30
plugins/samplemimo/testmosync/testmosyncgui.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -147,6 +147,12 @@
</item>
<item>
<widget class="QLabel" name="freqUnits">
<property name="minimumSize">
<size>
<width>0</width>
<height>47</height>
</size>
</property>
<property name="text">
<string> kHz</string>
</property>
@ -263,6 +269,12 @@
</item>
<item>
<widget class="QLabel" name="sampleRateLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>29</height>
</size>
</property>
<property name="text">
<string>SR</string>
</property>
@ -326,6 +338,12 @@
<layout class="QVBoxLayout" name="spectrumLayout">
<item>
<widget class="GLSpectrum" name="glSpectrum" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
@ -348,17 +366,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>GLSpectrum</class>
<extends>QWidget</extends>

8
plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
View File

@ -20,6 +20,7 @@
#include <QString>
#include <QMessageBox>
#include <QFileDialog>
#include <QResizeEvent>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
@ -66,6 +67,7 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) :
qDebug("XTRXMIMOGUI::XTRXMIMOGUI");
setAttribute(Qt::WA_DeleteOnClose, true);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getContents()->setStyleSheet(QString(tr("#XTRXMIMOGUI { border: 1px solid %1 }")
.arg(palette().highlight().color().darker(115).name())));
m_helpURL = "plugins/samplemimo/xtrxmimo/readme.md";
@ -140,6 +142,12 @@ bool XTRXMIMOGUI::deserialize(const QByteArray& data)
}
}
void XTRXMIMOGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void XTRXMIMOGUI::handleInputMessages()
{
Message* message;

3
plugins/samplemimo/xtrxmimo/xtrxmimogui.h
View File

@ -45,6 +45,9 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::XTRXMIMOGUI* ui;

26
plugins/samplemimo/xtrxmimo/xtrxmimogui.ui
View File

@ -6,20 +6,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>360</width>
<height>284</height>
<width>370</width>
<height>242</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<width>370</width>
<height>242</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>242</height>
</size>
</property>
<property name="font">
@ -1278,17 +1284,17 @@ QToolTip{background-color: white; color: black;}</string>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>