VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 10:05:46 -05:00
Code Issues Projects Releases Wiki Activity

Massive UI revamping (v7): fixed add channel and spectrum display after device renumbering. Fixes #1217

Browse Source
This commit is contained in:
f4exb 2022-04-28 00:01:08 +02:00
parent aac0e8954c
commit 4990144a61
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/feature/aprs/aprsgui.cpp
View File

@ -662,7 +662,7 @@ void APRSGUI::updateChannelList()
ui->sourcePipes->blockSignals(false); ui->sourcePipes->blockSignals(false);
} }
void APRSGUI::resizeEvent(QResizeEvent* size) void APRSGUI::resizeEvent(QResizeEvent*)
{ {
// Replot graphs to ensure Axis are visible // Replot graphs to ensure Axis are visible
plotWeather(); plotWeather();

22
sdrgui/mainwindow.cpp
View File

@ -433,7 +433,7 @@ void MainWindow::sampleSourceCreate(
deviceGUI, deviceGUI,
&DeviceGUI::showSpectrum, &DeviceGUI::showSpectrum,
this, this,
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); } &MainWindow::mainSpectrumShow
); );
QObject::connect( QObject::connect(
deviceGUI, deviceGUI,
@ -648,7 +648,7 @@ void MainWindow::sampleSinkCreate(
deviceGUI, deviceGUI,
&DeviceGUI::showSpectrum, &DeviceGUI::showSpectrum,
this, this,
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); } &MainWindow::mainSpectrumShow
); );
QObject::connect( QObject::connect(
deviceGUI, deviceGUI,
@ -837,7 +837,7 @@ void MainWindow::sampleMIMOCreate(
deviceGUI, deviceGUI,
&DeviceGUI::showSpectrum, &DeviceGUI::showSpectrum,
this, this,
[=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); } &MainWindow::mainSpectrumShow
); );
QObject::connect( QObject::connect(
deviceGUI, deviceGUI,
@ -973,6 +973,15 @@ void MainWindow::removeDeviceSet(int deviceSetIndex)
{ {
DeviceUISet *deviceUISet = m_deviceUIs[i]; DeviceUISet *deviceUISet = m_deviceUIs[i];
deviceUISet->setIndex(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); emit m_mainCore->deviceSetRemoved(deviceSetIndex);
@ -2572,10 +2581,11 @@ void MainWindow::mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation)
m_workspaces[wsIndexDestnation]->addToMdiArea(gui); m_workspaces[wsIndexDestnation]->addToMdiArea(gui);
} }
void MainWindow::mainSpectrumShow(MainSpectrumGUI *gui) void MainWindow::mainSpectrumShow(int deviceSetIndex)
{ {
gui->show(); DeviceUISet *deviceUISet = m_deviceUIs[deviceSetIndex];
gui->raise(); deviceUISet->m_mainSpectrumGUI->show();
deviceUISet->m_mainSpectrumGUI->raise();
} }
void MainWindow::showAllChannels(int deviceSetIndex) void MainWindow::showAllChannels(int deviceSetIndex)

2
sdrgui/mainwindow.h
View File

@ -207,7 +207,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 mainSpectrumShow(int deviceSetIndex);
void showAllChannels(int deviceSetIndex); void showAllChannels(int deviceSetIndex);
void openDeviceSetPresetsDialog(QPoint p, DeviceGUI *deviceGUI); void openDeviceSetPresetsDialog(QPoint p, DeviceGUI *deviceGUI);
void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release); void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);