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

Main Window: fixed sampling device changed. Fixes #668

Browse Source
This commit is contained in:
f4exb 2020-11-02 08:29:21 +01:00
parent edb9defdf6
commit 5903e170ca
2 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
sdrgui/mainwindow.cpp
View File

@ -466,14 +466,7 @@ void MainWindow::removeLastDevice()
ui->tabChannels->removeTab(ui->tabChannels->count() - 1); ui->tabChannels->removeTab(ui->tabChannels->count() - 1);
m_deviceWidgetTabs.removeLast(); m_deviceWidgetTabs.removeLast();
ui->tabInputsView->clear(); restoreDeviceTabs();
for (int i = 0; i < m_deviceWidgetTabs.size(); i++)
{
qDebug("MainWindow::removeLastDevice: adding back tab for %s", m_deviceWidgetTabs[i].displayName.toStdString().c_str());
ui->tabInputsView->addTab(m_deviceWidgetTabs[i].gui, m_deviceWidgetTabs[i].tabName);
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
DeviceAPI *sourceAPI = m_deviceUIs.back()->m_deviceAPI; DeviceAPI *sourceAPI = m_deviceUIs.back()->m_deviceAPI;
delete m_deviceUIs.back(); delete m_deviceUIs.back();
@ -505,14 +498,7 @@ void MainWindow::removeLastDevice()
ui->tabChannels->removeTab(ui->tabChannels->count() - 1); ui->tabChannels->removeTab(ui->tabChannels->count() - 1);
m_deviceWidgetTabs.removeLast(); m_deviceWidgetTabs.removeLast();
ui->tabInputsView->clear(); restoreDeviceTabs();
for (int i = 0; i < m_deviceWidgetTabs.size(); i++)
{
qDebug("MainWindow::removeLastDevice: adding back tab for %s", m_deviceWidgetTabs[i].displayName.toStdString().c_str());
ui->tabInputsView->addTab(m_deviceWidgetTabs[i].gui, m_deviceWidgetTabs[i].tabName);
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
DeviceAPI *sinkAPI = m_deviceUIs.back()->m_deviceAPI; DeviceAPI *sinkAPI = m_deviceUIs.back()->m_deviceAPI;
delete m_deviceUIs.back(); delete m_deviceUIs.back();
@ -544,14 +530,7 @@ void MainWindow::removeLastDevice()
ui->tabChannels->removeTab(ui->tabChannels->count() - 1); ui->tabChannels->removeTab(ui->tabChannels->count() - 1);
m_deviceWidgetTabs.removeLast(); m_deviceWidgetTabs.removeLast();
ui->tabInputsView->clear(); restoreDeviceTabs();
for (int i = 0; i < m_deviceWidgetTabs.size(); i++)
{
qDebug("MainWindow::removeLastDevice: adding back tab for %s", m_deviceWidgetTabs[i].displayName.toStdString().c_str());
ui->tabInputsView->addTab(m_deviceWidgetTabs[i].gui, m_deviceWidgetTabs[i].tabName);
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
DeviceAPI *mimoAPI = m_deviceUIs.back()->m_deviceAPI; DeviceAPI *mimoAPI = m_deviceUIs.back()->m_deviceAPI;
delete m_deviceUIs.back(); delete m_deviceUIs.back();
@ -610,32 +589,25 @@ void MainWindow::addViewAction(QAction* action)
void MainWindow::setDeviceGUI(int deviceTabIndex, QWidget* gui, const QString& deviceDisplayName, int deviceType) void MainWindow::setDeviceGUI(int deviceTabIndex, QWidget* gui, const QString& deviceDisplayName, int deviceType)
{ {
char tabNameCStr[16]; QString tabName;
if (deviceType == 0) { if (deviceType == 0) {
sprintf(tabNameCStr, "R%d", deviceTabIndex); tabName = tr("R%1").arg(deviceTabIndex);
} else if (deviceType == 1) { } else if (deviceType == 1) {
sprintf(tabNameCStr, "T%d", deviceTabIndex); tabName = tr("T%1").arg(deviceTabIndex);
} else if (deviceType == 2) { } else if (deviceType == 2) {
sprintf(tabNameCStr, "M%d", deviceTabIndex); tabName = tr("M%1").arg(deviceTabIndex);
} }
qDebug("MainWindow::setDeviceGUI: insert device type %d tab at %d", deviceType, deviceTabIndex); qDebug("MainWindow::setDeviceGUI: insert device type %d tab at %d", deviceType, deviceTabIndex);
if (deviceTabIndex < m_deviceWidgetTabs.size()) { if (deviceTabIndex < m_deviceWidgetTabs.size()) {
m_deviceWidgetTabs[deviceTabIndex] = {gui, deviceDisplayName, QString(tabNameCStr)}; m_deviceWidgetTabs[deviceTabIndex] = {gui, deviceDisplayName, tabName};
} else { } else {
m_deviceWidgetTabs.append({gui, deviceDisplayName, QString(tabNameCStr)}); m_deviceWidgetTabs.append({gui, deviceDisplayName, tabName});
} }
ui->tabInputsView->clear(); restoreDeviceTabs();
for (int i = 0; i < m_deviceWidgetTabs.size(); i++)
{
qDebug("MainWindow::setDeviceGUI: adding tab for %s", m_deviceWidgetTabs[i].displayName.toStdString().c_str());
ui->tabInputsView->addTab(m_deviceWidgetTabs[i].gui, m_deviceWidgetTabs[i].tabName);
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
ui->tabInputsView->setCurrentIndex(deviceTabIndex); ui->tabInputsView->setCurrentIndex(deviceTabIndex);
} }
@ -1713,7 +1685,7 @@ void MainWindow::sampleSourceChanged(int tabIndex, int newDeviceIndex)
// deletes old UI and input object // deletes old UI and input object
deviceUI->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(nullptr); // have source stop sending messages to the GUI deviceUI->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(nullptr); // have source stop sending messages to the GUI
m_deviceUIs.back()->m_deviceGUI->destroy(); m_deviceUIs[tabIndex]->m_deviceGUI->destroy();
deviceUI->m_deviceAPI->resetSamplingDeviceId(); deviceUI->m_deviceAPI->resetSamplingDeviceId();
deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput(deviceUI->m_deviceAPI->getSampleSource()); deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput(deviceUI->m_deviceAPI->getSampleSource());
deviceUI->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists deviceUI->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists
@ -1820,7 +1792,7 @@ void MainWindow::sampleSinkChanged(int tabIndex, int newDeviceIndex)
// deletes old UI and output object // deletes old UI and output object
deviceUI->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI deviceUI->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI
m_deviceUIs.back()->m_deviceGUI->destroy(); m_deviceUIs[tabIndex]->m_deviceGUI->destroy();
deviceUI->m_deviceAPI->resetSamplingDeviceId(); deviceUI->m_deviceAPI->resetSamplingDeviceId();
deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput(deviceUI->m_deviceAPI->getSampleSink()); deviceUI->m_deviceAPI->getPluginInterface()->deleteSampleSinkPluginInstanceOutput(deviceUI->m_deviceAPI->getSampleSink());
deviceUI->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists deviceUI->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists
@ -2102,3 +2074,15 @@ void MainWindow::commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifie
} }
} }
} }
void MainWindow::restoreDeviceTabs()
{
ui->tabInputsView->clear();
for (int i = 0; i < m_deviceWidgetTabs.size(); i++)
{
qDebug("MainWindow::restoreDeviceTabs: adding tab for %s", qPrintable(m_deviceWidgetTabs[i].displayName));
ui->tabInputsView->addTab(m_deviceWidgetTabs[i].gui, m_deviceWidgetTabs[i].tabName);
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
}

1
sdrgui/mainwindow.h
View File

@ -147,6 +147,7 @@ private:
void deleteFeature(int featureSetIndex, int featureIndex); void deleteFeature(int featureSetIndex, int featureIndex);
bool handleMessage(const Message& cmd); bool handleMessage(const Message& cmd);
void restoreDeviceTabs();
private slots: private slots:
void handleMessages(); void handleMessages();