mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-23 01:55:48 -05:00
Massive UI revamping (v7): fixed add channel and spectrum display after device renumbering. Fixes #1217
This commit is contained in:
parent
aac0e8954c
commit
4990144a61
@ -662,7 +662,7 @@ void APRSGUI::updateChannelList()
|
||||
ui->sourcePipes->blockSignals(false);
|
||||
}
|
||||
|
||||
void APRSGUI::resizeEvent(QResizeEvent* size)
|
||||
void APRSGUI::resizeEvent(QResizeEvent*)
|
||||
{
|
||||
// Replot graphs to ensure Axis are visible
|
||||
plotWeather();
|
||||
|
@ -433,7 +433,7 @@ void MainWindow::sampleSourceCreate(
|
||||
deviceGUI,
|
||||
&DeviceGUI::showSpectrum,
|
||||
this,
|
||||
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
|
||||
&MainWindow::mainSpectrumShow
|
||||
);
|
||||
QObject::connect(
|
||||
deviceGUI,
|
||||
@ -648,7 +648,7 @@ void MainWindow::sampleSinkCreate(
|
||||
deviceGUI,
|
||||
&DeviceGUI::showSpectrum,
|
||||
this,
|
||||
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
|
||||
&MainWindow::mainSpectrumShow
|
||||
);
|
||||
QObject::connect(
|
||||
deviceGUI,
|
||||
@ -837,7 +837,7 @@ void MainWindow::sampleMIMOCreate(
|
||||
deviceGUI,
|
||||
&DeviceGUI::showSpectrum,
|
||||
this,
|
||||
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
|
||||
&MainWindow::mainSpectrumShow
|
||||
);
|
||||
QObject::connect(
|
||||
deviceGUI,
|
||||
@ -973,6 +973,15 @@ void MainWindow::removeDeviceSet(int deviceSetIndex)
|
||||
{
|
||||
DeviceUISet *deviceUISet = m_deviceUIs[i];
|
||||
deviceUISet->setIndex(i);
|
||||
DeviceGUI *deviceGUI = m_deviceUIs[i]->m_deviceGUI;
|
||||
Workspace *deviceWorkspace = m_workspaces[deviceGUI->getWorkspaceIndex()];
|
||||
|
||||
QObject::connect(
|
||||
deviceGUI,
|
||||
&DeviceGUI::addChannelEmitted,
|
||||
this,
|
||||
[=](int channelPluginIndex){ this->channelAddClicked(deviceWorkspace, i, channelPluginIndex); }
|
||||
);
|
||||
}
|
||||
|
||||
emit m_mainCore->deviceSetRemoved(deviceSetIndex);
|
||||
@ -2572,10 +2581,11 @@ void MainWindow::mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation)
|
||||
m_workspaces[wsIndexDestnation]->addToMdiArea(gui);
|
||||
}
|
||||
|
||||
void MainWindow::mainSpectrumShow(MainSpectrumGUI *gui)
|
||||
void MainWindow::mainSpectrumShow(int deviceSetIndex)
|
||||
{
|
||||
gui->show();
|
||||
gui->raise();
|
||||
DeviceUISet *deviceUISet = m_deviceUIs[deviceSetIndex];
|
||||
deviceUISet->m_mainSpectrumGUI->show();
|
||||
deviceUISet->m_mainSpectrumGUI->raise();
|
||||
}
|
||||
|
||||
void MainWindow::showAllChannels(int deviceSetIndex)
|
||||
|
@ -207,7 +207,7 @@ private slots:
|
||||
void openFeaturePresetsDialog(QPoint p, Workspace *workspace);
|
||||
void deviceMove(DeviceGUI *gui, int wsIndexDestnation);
|
||||
void mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation);
|
||||
void mainSpectrumShow(MainSpectrumGUI *gui);
|
||||
void mainSpectrumShow(int deviceSetIndex);
|
||||
void showAllChannels(int deviceSetIndex);
|
||||
void openDeviceSetPresetsDialog(QPoint p, DeviceGUI *deviceGUI);
|
||||
void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);
|
||||
|
Loading…
Reference in New Issue
Block a user