mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-27 07:16:48 -04:00
Massive UI revamping (v7): main spectrum show/hide and minimum width set to 360
This commit is contained in:
parent
cfde845b5a
commit
4ff5d241c8
@ -174,6 +174,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) :
|
|||||||
connect(this, SIGNAL(forceShrink()), this, SLOT(shrinkWindow()));
|
connect(this, SIGNAL(forceShrink()), this, SLOT(shrinkWindow()));
|
||||||
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(close()));
|
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(close()));
|
||||||
connect(this, SIGNAL(forceClose()), this, SLOT(close()));
|
connect(this, SIGNAL(forceClose()), this, SLOT(close()));
|
||||||
|
connect(m_showSpectrumButton, SIGNAL(clicked()), this, SLOT(showSpectrumHandler()));
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceGUI::~DeviceGUI()
|
DeviceGUI::~DeviceGUI()
|
||||||
@ -274,6 +275,11 @@ void DeviceGUI::openMoveToWorkspaceDialog()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DeviceGUI::showSpectrumHandler()
|
||||||
|
{
|
||||||
|
emit showSpectrum(m_deviceSetIndex);
|
||||||
|
}
|
||||||
|
|
||||||
void DeviceGUI::shrinkWindow()
|
void DeviceGUI::shrinkWindow()
|
||||||
{
|
{
|
||||||
qDebug("DeviceGUI::shrinkWindow");
|
qDebug("DeviceGUI::shrinkWindow");
|
||||||
|
@ -125,6 +125,7 @@ private slots:
|
|||||||
void deviceReload();
|
void deviceReload();
|
||||||
void showHelp();
|
void showHelp();
|
||||||
void openMoveToWorkspaceDialog();
|
void openMoveToWorkspaceDialog();
|
||||||
|
void showSpectrumHandler();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void forceClose();
|
void forceClose();
|
||||||
@ -133,6 +134,7 @@ signals:
|
|||||||
void forceShrink();
|
void forceShrink();
|
||||||
void deviceAdd(int deviceType, int deviceIndex);
|
void deviceAdd(int deviceType, int deviceIndex);
|
||||||
void deviceChange(int newDeviceIndex);
|
void deviceChange(int newDeviceIndex);
|
||||||
|
void showSpectrum(int deviceSetIndex);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // INCLUDE_DEVICEGUI_H
|
#endif // INCLUDE_DEVICEGUI_H
|
||||||
|
@ -174,6 +174,10 @@ void DeviceUISet::loadDeviceSetSettings(
|
|||||||
m_spectrumGUI->deserialize(preset->getSpectrumConfig());
|
m_spectrumGUI->deserialize(preset->getSpectrumConfig());
|
||||||
m_deviceAPI->loadSamplingDeviceSettings(preset);
|
m_deviceAPI->loadSamplingDeviceSettings(preset);
|
||||||
|
|
||||||
|
if (!preset->getShowSpectrum()) {
|
||||||
|
m_mainSpectrumGUI->hide();
|
||||||
|
}
|
||||||
|
|
||||||
if (m_deviceSourceEngine) { // source device
|
if (m_deviceSourceEngine) { // source device
|
||||||
loadRxChannelSettings(preset, pluginAPI);
|
loadRxChannelSettings(preset, pluginAPI);
|
||||||
} else if (m_deviceSinkEngine) { // sink device
|
} else if (m_deviceSinkEngine) { // sink device
|
||||||
@ -188,6 +192,7 @@ void DeviceUISet::saveDeviceSetSettings(Preset* preset) const
|
|||||||
preset->setSpectrumConfig(m_spectrumGUI->serialize());
|
preset->setSpectrumConfig(m_spectrumGUI->serialize());
|
||||||
preset->setSpectrumWorkspaceIndex(m_mainSpectrumGUI->getWorkspaceIndex());
|
preset->setSpectrumWorkspaceIndex(m_mainSpectrumGUI->getWorkspaceIndex());
|
||||||
preset->setSpectrumGeometry(m_mainSpectrumGUI->saveGeometry());
|
preset->setSpectrumGeometry(m_mainSpectrumGUI->saveGeometry());
|
||||||
|
preset->setShowSpectrum(m_spectrumGUI->isVisible());
|
||||||
preset->setSelectedDevice(Preset::SelectedDevice{
|
preset->setSelectedDevice(Preset::SelectedDevice{
|
||||||
m_deviceAPI->getSamplingDeviceId(),
|
m_deviceAPI->getSamplingDeviceId(),
|
||||||
m_deviceAPI->getSamplingDeviceSerial(),
|
m_deviceAPI->getSamplingDeviceSerial(),
|
||||||
|
@ -99,7 +99,7 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
|
|||||||
setAttribute(Qt::WA_NoSystemBackground, true);
|
setAttribute(Qt::WA_NoSystemBackground, true);
|
||||||
setMouseTracking(true);
|
setMouseTracking(true);
|
||||||
|
|
||||||
setMinimumSize(200, 200);
|
setMinimumSize(360, 200);
|
||||||
|
|
||||||
m_waterfallShare = 0.5;
|
m_waterfallShare = 0.5;
|
||||||
|
|
||||||
|
@ -516,6 +516,12 @@ void MainWindow::sampleSourceCreate(
|
|||||||
this,
|
this,
|
||||||
[=](int newDeviceIndex){ this->sampleDeviceChangeHandler(deviceGUI, newDeviceIndex); }
|
[=](int newDeviceIndex){ this->sampleDeviceChangeHandler(deviceGUI, newDeviceIndex); }
|
||||||
);
|
);
|
||||||
|
QObject::connect(
|
||||||
|
deviceGUI,
|
||||||
|
&DeviceGUI::showSpectrum,
|
||||||
|
this,
|
||||||
|
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
|
||||||
|
);
|
||||||
deviceAPI->getSampleSource()->setMessageQueueToGUI(deviceGUI->getInputMessageQueue());
|
deviceAPI->getSampleSource()->setMessageQueueToGUI(deviceGUI->getInputMessageQueue());
|
||||||
deviceUISet->m_deviceGUI = deviceGUI;
|
deviceUISet->m_deviceGUI = deviceGUI;
|
||||||
const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex);
|
const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex);
|
||||||
@ -2501,6 +2507,11 @@ void MainWindow::mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation)
|
|||||||
m_workspaces[wsIndexDestnation]->addToMdiArea(gui);
|
m_workspaces[wsIndexDestnation]->addToMdiArea(gui);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::mainSpectrumShow(MainSpectrumGUI *gui)
|
||||||
|
{
|
||||||
|
gui->show();
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::openFeaturePresetsDialog(QPoint p, Workspace *workspace)
|
void MainWindow::openFeaturePresetsDialog(QPoint p, Workspace *workspace)
|
||||||
{
|
{
|
||||||
FeaturePresetsDialog dialog;
|
FeaturePresetsDialog dialog;
|
||||||
|
@ -208,6 +208,7 @@ private slots:
|
|||||||
void openFeaturePresetsDialog(QPoint p, Workspace *workspace);
|
void openFeaturePresetsDialog(QPoint p, Workspace *workspace);
|
||||||
void deviceMove(DeviceGUI *gui, int wsIndexDestnation);
|
void deviceMove(DeviceGUI *gui, int wsIndexDestnation);
|
||||||
void mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation);
|
void mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation);
|
||||||
|
void mainSpectrumShow(MainSpectrumGUI *gui);
|
||||||
void on_action_Quick_Start_triggered();
|
void on_action_Quick_Start_triggered();
|
||||||
void on_action_Main_Window_triggered();
|
void on_action_Main_Window_triggered();
|
||||||
void on_action_Loaded_Plugins_triggered();
|
void on_action_Loaded_Plugins_triggered();
|
||||||
|
Loading…
Reference in New Issue
Block a user