From 78d016051432c79482f94014ad96d65feb2a0ff9 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 13:57:11 +0100 Subject: [PATCH 1/7] MainWindow: Add FSMs to avoid blocking on the GUI thread. DSPDevice*Engine: Add signals to indicate when commands have been processed. DSPDeviceSourceEngine: Fix small memory leak. DSPEngine::removeDeviceEngineAt: Remove wait to avoid blocking thread. Return QThread to get finished signal. DSPEngine::addDevice*Engine: Don't call deleteLater for device*Engine, as these objects are deleted manually in MainWindow, which will crash if deleteLater called first. --- CMakeLists.txt | 1 + sdrbase/dsp/dspdevicemimoengine.cpp | 4 + sdrbase/dsp/dspdevicemimoengine.h | 5 + sdrbase/dsp/dspdevicesinkengine.cpp | 3 + sdrbase/dsp/dspdevicesinkengine.h | 4 + sdrbase/dsp/dspdevicesourceengine.cpp | 8 +- sdrbase/dsp/dspdevicesourceengine.h | 4 + sdrbase/dsp/dspengine.cpp | 35 +- sdrbase/dsp/dspengine.h | 2 +- sdrgui/CMakeLists.txt | 3 + sdrgui/mainwindow.cpp | 1567 ++++++++++++++++--------- sdrgui/mainwindow.h | 243 +++- 12 files changed, 1296 insertions(+), 583 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bee48492d0..50dfaadc07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -704,6 +704,7 @@ if (BUILD_GUI) QuickWidgets Svg SvgWidgets + StateMachine OPTIONAL_COMPONENTS WebEngineQuick WebEngineCore diff --git a/sdrbase/dsp/dspdevicemimoengine.cpp b/sdrbase/dsp/dspdevicemimoengine.cpp index 0cf3cd7d9c..0ba6bb1108 100644 --- a/sdrbase/dsp/dspdevicemimoengine.cpp +++ b/sdrbase/dsp/dspdevicemimoengine.cpp @@ -1030,6 +1030,7 @@ bool DSPDeviceMIMOEngine::handleMessage(const Message& message) else if (DSPAcquisitionStop::match(message)) { setStateRx(gotoIdle(0)); + emit acquisitionStopped(); return true; } else if (DSPGenerationInit::match(message)) @@ -1053,11 +1054,13 @@ bool DSPDeviceMIMOEngine::handleMessage(const Message& message) else if (DSPGenerationStop::match(message)) { setStateTx(gotoIdle(1)); + emit generationStopped(); return true; } else if (SetSampleMIMO::match(message)) { const auto& cmd = (const SetSampleMIMO&) message; handleSetMIMO(cmd.getSampleMIMO()); + emit sampleSet(); return true; } else if (AddBasebandSampleSink::match(message)) @@ -1194,6 +1197,7 @@ bool DSPDeviceMIMOEngine::handleMessage(const Message& message) BasebandSampleSink* spectrumSink = msg.getSampleSink(); spectrumSink->stop(); m_spectrumSink = nullptr; + emit spectrumSinkRemoved(); return true; } else if (SetSpectrumSinkInput::match(message)) diff --git a/sdrbase/dsp/dspdevicemimoengine.h b/sdrbase/dsp/dspdevicemimoengine.h index 191b95c25e..6d720036d7 100644 --- a/sdrbase/dsp/dspdevicemimoengine.h +++ b/sdrbase/dsp/dspdevicemimoengine.h @@ -356,6 +356,11 @@ private slots: signals: void stateChanged(); + + void acquisitionStopped(); + void sampleSet(); + void generationStopped(); + void spectrumSinkRemoved(); }; #endif // SDRBASE_DSP_DSPDEVICEMIMOENGINE_H_ diff --git a/sdrbase/dsp/dspdevicesinkengine.cpp b/sdrbase/dsp/dspdevicesinkengine.cpp index 0f3d8fd07c..8643e8fd39 100644 --- a/sdrbase/dsp/dspdevicesinkengine.cpp +++ b/sdrbase/dsp/dspdevicesinkengine.cpp @@ -458,12 +458,14 @@ bool DSPDeviceSinkEngine::handleMessage(const Message& message) else if (DSPGenerationStop::match(message)) { setState(gotoIdle()); + emit generationStopped(); return true; } else if (DSPSetSink::match(message)) { const auto& cmd = (const DSPSetSink&) message; handleSetSink(cmd.getSampleSink()); + emit sampleSet(); return true; } else if (DSPRemoveSpectrumSink::match(message)) @@ -476,6 +478,7 @@ bool DSPDeviceSinkEngine::handleMessage(const Message& message) } m_spectrumSink = nullptr; + emit spectrumSinkRemoved(); return true; } else if (DSPAddBasebandSampleSource::match(message)) diff --git a/sdrbase/dsp/dspdevicesinkengine.h b/sdrbase/dsp/dspdevicesinkengine.h index 7917e49aef..33965f6095 100644 --- a/sdrbase/dsp/dspdevicesinkengine.h +++ b/sdrbase/dsp/dspdevicesinkengine.h @@ -121,6 +121,10 @@ private slots: signals: void stateChanged(); + + void generationStopped(); + void sampleSet(); + void spectrumSinkRemoved(); }; diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp index d6899f13d1..77fd4f91f2 100644 --- a/sdrbase/dsp/dspdevicesourceengine.cpp +++ b/sdrbase/dsp/dspdevicesourceengine.cpp @@ -52,7 +52,7 @@ DSPDeviceSourceEngine::DSPDeviceSourceEngine(uint uid, QObject* parent) : DSPDeviceSourceEngine::~DSPDeviceSourceEngine() { - qDebug("DSPDeviceSourceEngine::~DSPDeviceSourceEngine"); + qDebug("DSPDeviceSourceEngine::~DSPDeviceSourceEngine"); } void DSPDeviceSourceEngine::setState(State state) @@ -601,12 +601,15 @@ bool DSPDeviceSourceEngine::handleMessage(const Message& message) else if (DSPAcquisitionStop::match(message)) { setState(gotoIdle()); + emit acquistionStopped(); return true; } else if (DSPSetSource::match(message)) { auto cmd = (const DSPSetSource&) message; handleSetSource(cmd.getSampleSource()); + emit sampleSet(); + return true; } else if (DSPAddBasebandSampleSink::match(message)) { @@ -620,6 +623,7 @@ bool DSPDeviceSourceEngine::handleMessage(const Message& message) if(m_state == State::StRunning) { sink->start(); } + return true; } else if (DSPRemoveBasebandSampleSink::match(message)) { @@ -631,6 +635,8 @@ bool DSPDeviceSourceEngine::handleMessage(const Message& message) } m_basebandSampleSinks.remove(sink); + emit sinkRemoved(); + return true; } return false; diff --git a/sdrbase/dsp/dspdevicesourceengine.h b/sdrbase/dsp/dspdevicesourceengine.h index cd440d7c04..de7b6a4326 100644 --- a/sdrbase/dsp/dspdevicesourceengine.h +++ b/sdrbase/dsp/dspdevicesourceengine.h @@ -142,6 +142,10 @@ private slots: signals: void stateChanged(); + + void acquistionStopped(); + void sampleSet(); + void sinkRemoved(); }; #endif // INCLUDE_DSPDEVICEENGINE_H diff --git a/sdrbase/dsp/dspengine.cpp b/sdrbase/dsp/dspengine.cpp index 7e8f72d278..47726ea538 100644 --- a/sdrbase/dsp/dspengine.cpp +++ b/sdrbase/dsp/dspengine.cpp @@ -70,12 +70,6 @@ DSPDeviceSourceEngine *DSPEngine::addDeviceSourceEngine() m_deviceEngineReferences.push_back(DeviceEngineReference{0, m_deviceSourceEngines.back(), nullptr, nullptr, deviceThread}); deviceSourceEngine->moveToThread(deviceThread); - QObject::connect( - deviceThread, - &QThread::finished, - deviceSourceEngine, - &QObject::deleteLater - ); QObject::connect( deviceThread, &QThread::finished, @@ -118,12 +112,6 @@ DSPDeviceSinkEngine *DSPEngine::addDeviceSinkEngine() m_deviceEngineReferences.push_back(DeviceEngineReference{1, nullptr, m_deviceSinkEngines.back(), nullptr, deviceThread}); deviceSinkEngine->moveToThread(deviceThread); - QObject::connect( - deviceThread, - &QThread::finished, - deviceSinkEngine, - &QObject::deleteLater - ); QObject::connect( deviceThread, &QThread::finished, @@ -166,12 +154,6 @@ DSPDeviceMIMOEngine *DSPEngine::addDeviceMIMOEngine() m_deviceEngineReferences.push_back(DeviceEngineReference{2, nullptr, nullptr, m_deviceMIMOEngines.back(), deviceThread}); deviceMIMOEngine->moveToThread(deviceThread); - QObject::connect( - deviceThread, - &QThread::finished, - deviceMIMOEngine, - &QObject::deleteLater - ); QObject::connect( deviceThread, &QThread::finished, @@ -205,38 +187,39 @@ void DSPEngine::removeLastDeviceMIMOEngine() } } -void DSPEngine::removeDeviceEngineAt(int deviceIndex) +QThread * DSPEngine::removeDeviceEngineAt(int deviceIndex) { if (deviceIndex >= m_deviceEngineReferences.size()) { - return; + return nullptr; } + QThread *deviceThread = nullptr; + if (m_deviceEngineReferences[deviceIndex].m_deviceEngineType == 0) // source { DSPDeviceSourceEngine *deviceEngine = m_deviceEngineReferences[deviceIndex].m_deviceSourceEngine; - QThread *deviceThread = m_deviceEngineReferences[deviceIndex].m_thread; + deviceThread = m_deviceEngineReferences[deviceIndex].m_thread; deviceThread->exit(); - deviceThread->wait(); m_deviceSourceEngines.removeAll(deviceEngine); } else if (m_deviceEngineReferences[deviceIndex].m_deviceEngineType == 1) // sink { DSPDeviceSinkEngine *deviceEngine = m_deviceEngineReferences[deviceIndex].m_deviceSinkEngine; - QThread *deviceThread = m_deviceEngineReferences[deviceIndex].m_thread; + deviceThread = m_deviceEngineReferences[deviceIndex].m_thread; deviceThread->exit(); - deviceThread->wait(); m_deviceSinkEngines.removeAll(deviceEngine); } else if (m_deviceEngineReferences[deviceIndex].m_deviceEngineType == 2) // MIMO { DSPDeviceMIMOEngine *deviceEngine = m_deviceEngineReferences[deviceIndex].m_deviceMIMOEngine; - QThread *deviceThread = m_deviceEngineReferences[deviceIndex].m_thread; + deviceThread = m_deviceEngineReferences[deviceIndex].m_thread; deviceThread->exit(); - deviceThread->wait(); m_deviceMIMOEngines.removeAll(deviceEngine); } m_deviceEngineReferences.removeAt(deviceIndex); + + return deviceThread; } void DSPEngine::createFFTFactory(const QString& fftWisdomFileName) diff --git a/sdrbase/dsp/dspengine.h b/sdrbase/dsp/dspengine.h index a8cad782d0..3171c4cd9c 100644 --- a/sdrbase/dsp/dspengine.h +++ b/sdrbase/dsp/dspengine.h @@ -53,7 +53,7 @@ class SDRBASE_API DSPEngine : public QObject { DSPDeviceMIMOEngine *addDeviceMIMOEngine(); void removeLastDeviceMIMOEngine(); - void removeDeviceEngineAt(int deviceIndex); + QThread *removeDeviceEngineAt(int deviceIndex); AudioDeviceManager *getAudioDeviceManager() { return &m_audioDeviceManager; } diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index d524583d58..7a45abcc6b 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -343,6 +343,9 @@ target_link_libraries(sdrgui logging ) if (Qt6_FOUND) + target_link_libraries(sdrgui + Qt6::StateMachine + ) target_link_libraries(sdrbase Qt::OpenGLWidgets ) diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 737190b6e5..450b010c9f 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -132,9 +132,12 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse m_showSystemWidget(nullptr), m_commandKeyReceiver(nullptr), m_profileDialog(nullptr), - m_fftWisdomProcess(nullptr) +#if QT_CONFIG(process) + m_fftWisdomProcess(nullptr), +#endif + m_settingsSaved(false) { -#ifdef ANDROID +#if defined(ANDROID) || defined(__EMSCRIPTEN__) bool showWelcome = true; #else bool showWelcome = false; @@ -146,6 +149,8 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse qDebug() << "MainWindow::MainWindow: start"; setWindowTitle("SDRangel"); + QApplication::setOverrideCursor(Qt::WaitCursor); + m_instance = this; m_mainCore->m_logger = logger; m_mainCore->m_masterTabIndex = 0; @@ -246,33 +251,6 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse addFeatureSet(); // Create the uniuefeature set m_apiAdapter = new WebAPIAdapter(); - if (parser.getScratch()) - { - qDebug() << "MainWindow::MainWindow: scratch mode: do not load current configuration"; - } - else - { - splash->showStatusMessage("load current configuration...", Qt::white); - qDebug() << "MainWindow::MainWindow: load current configuration..."; - loadConfiguration(m_mainCore->m_settings.getWorkingConfiguration()); - - if (m_workspaces.empty()) - { - qDebug() << "MainWindow::MainWindow: no or empty current configuration, creating empty workspace..."; - addWorkspace(); - - // If no configurations, load some basic examples - if (m_mainCore->m_settings.getConfigurations()->empty()) { - loadDefaultConfigurations(); - } - } - else - { - // Only show welcome dialog first time program is run - showWelcome = false; - } - } - splash->showStatusMessage("finishing...", Qt::white); QString applicationDirPath = qApp->applicationDirPath(); @@ -294,22 +272,16 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse m_dspEngine->setMIMOSupport(true); - delete splash; - // Restore window size and position QSettings s; restoreGeometry(qUncompress(QByteArray::fromBase64(s.value("mainWindowGeometry").toByteArray()))); restoreState(qUncompress(QByteArray::fromBase64(s.value("mainWindowState").toByteArray()))); - if (showWelcome) - { - // Show welcome dialog - WelcomeDialog welcomeDialog(this); - new DialogPositioner(&welcomeDialog, true); - welcomeDialog.exec(); - // Show configurations - openConfigurationDialog(true); - } + // Load initial configuration + InitFSM *fsm = new InitFSM(this, splash, !parser.getScratch()); + connect(fsm, &InitFSM::finished, fsm, &InitFSM::deleteLater); + connect(fsm, &InitFSM::finished, splash, &SDRangelSplash::deleteLater); + fsm->start(); qDebug() << "MainWindow::MainWindow: end"; } @@ -340,79 +312,931 @@ MainWindow::~MainWindow() qDebug() << "MainWindow::~MainWindow: end"; } -void MainWindow::sampleSourceAdd(Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex) +MainWindowFSM::MainWindowFSM(MainWindow *mainWindow, QObject *parent) : + QStateMachine(parent), + m_mainWindow(mainWindow), + m_finalState(nullptr) +{ +} + +void MainWindowFSM::createStates(int states) +{ + for (int i = 0; i < states - 1; i++) { + m_states.append(new QState()); + } + m_finalState = new QFinalState(); + for (int i = 0; i < m_states.size(); i++) { + addState(m_states[i]); + } + addState(m_finalState); + setInitialState(m_states[0]); +} + +AddSampleSourceFSM::AddSampleSourceFSM(MainWindow *mainWindow, Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex, bool loadDefaults, QObject *parent) : + MainWindowFSM(mainWindow, parent), + m_deviceWorkspace(deviceWorkspace), + m_spectrumWorkspace(spectrumWorkspace), + m_deviceIndex(deviceIndex), + m_loadDefaults(loadDefaults), + m_deviceSetIndex(-1), + m_deviceAPI(nullptr), + m_deviceUISet(nullptr) { - DSPDeviceSourceEngine *dspDeviceSourceEngine = m_dspEngine->addDeviceSourceEngine(); + // Create source engine + addEngine(); - auto deviceSetIndex = (int) m_deviceUIs.size(); - m_mainCore->appendDeviceSet(0); - m_deviceUIs.push_back(new DeviceUISet(deviceSetIndex, m_mainCore->m_deviceSets.back())); - m_deviceUIs.back()->m_deviceSourceEngine = dspDeviceSourceEngine; - m_mainCore->m_deviceSets.back()->m_deviceSourceEngine = dspDeviceSourceEngine; - m_deviceUIs.back()->m_deviceSinkEngine = nullptr; - m_mainCore->m_deviceSets.back()->m_deviceSinkEngine = nullptr; - m_deviceUIs.back()->m_deviceMIMOEngine = nullptr; - m_mainCore->m_deviceSets.back()->m_deviceMIMOEngine = nullptr; + // Create FSM + createStates(3); - auto *deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleRx, deviceSetIndex, dspDeviceSourceEngine, nullptr, nullptr); + m_states[0]->addTransition(m_dspDeviceSourceEngine, &DSPDeviceSourceEngine::sampleSet, m_states[1]); + m_states[1]->addTransition(m_finalState); - m_deviceUIs.back()->m_deviceAPI = deviceAPI; - m_mainCore->m_deviceSets.back()->m_deviceAPI = deviceAPI; + connect(m_states[0], &QState::entered, this, &AddSampleSourceFSM::addDevice); + connect(m_states[1], &QState::entered, this, &AddSampleSourceFSM::addDeviceUI); +} + +void AddSampleSourceFSM::addEngine() +{ + // Create the source engine + m_dspDeviceSourceEngine = m_mainWindow->m_dspEngine->addDeviceSourceEngine(); +} + +void AddSampleSourceFSM::addDevice() +{ + m_deviceSetIndex = (int) m_mainWindow->m_deviceUIs.size(); + m_mainWindow->m_mainCore->appendDeviceSet(0); + + DeviceSet *deviceSet = m_mainWindow->m_mainCore->getDeviceSets().back(); + m_deviceUISet = new DeviceUISet(m_deviceSetIndex, deviceSet); + m_mainWindow->m_deviceUIs.push_back(m_deviceUISet); + + m_deviceUISet->m_deviceSourceEngine = m_dspDeviceSourceEngine; + deviceSet->m_deviceSourceEngine = m_dspDeviceSourceEngine; + m_deviceUISet->m_deviceSinkEngine = nullptr; + deviceSet->m_deviceSinkEngine = nullptr; + m_deviceUISet->m_deviceMIMOEngine = nullptr; + deviceSet->m_deviceMIMOEngine = nullptr; + + m_deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleRx, m_deviceSetIndex, m_dspDeviceSourceEngine, nullptr, nullptr); + + m_deviceUISet->m_deviceAPI = m_deviceAPI; + deviceSet->m_deviceAPI = m_deviceAPI; QList channelNames; - m_pluginManager->listRxChannels(channelNames); - m_deviceUIs.back()->setNumberOfAvailableRxChannels(channelNames.size()); + m_mainWindow->m_pluginManager->listRxChannels(channelNames); + m_deviceUISet->setNumberOfAvailableRxChannels(channelNames.size()); - dspDeviceSourceEngine->addSink(m_deviceUIs.back()->m_spectrumVis); + m_dspDeviceSourceEngine->addSink(m_deviceUISet->m_spectrumVis); // Create a file source instance by default if requested device was not enumerated (index = -1) - if (deviceIndex < 0) { - deviceIndex = DeviceEnumerator::instance()->getFileInputDeviceIndex(); + if (m_deviceIndex < 0) { + m_deviceIndex = DeviceEnumerator::instance()->getFileInputDeviceIndex(); } - sampleSourceCreate(deviceSetIndex, deviceIndex, m_deviceUIs.back()); - m_deviceUIs.back()->m_deviceGUI->setWorkspaceIndex(deviceWorkspace->getIndex()); - m_deviceUIs.back()->m_mainSpectrumGUI->setWorkspaceIndex(spectrumWorkspace->getIndex()); - MainSpectrumGUI *mainSpectrumGUI = m_deviceUIs.back()->m_mainSpectrumGUI; + m_mainWindow->sampleSourceCreate(m_deviceSetIndex, m_deviceIndex, m_deviceUISet); +} + +void AddSampleSourceFSM::addDeviceUI() +{ + m_mainWindow->sampleSourceCreateUI(m_deviceSetIndex, m_deviceIndex, m_deviceUISet); + + m_deviceUISet->m_deviceGUI->setWorkspaceIndex(m_deviceWorkspace->getIndex()); + m_deviceUISet->m_mainSpectrumGUI->setWorkspaceIndex(m_spectrumWorkspace->getIndex()); + MainSpectrumGUI *mainSpectrumGUI = m_deviceUISet->m_mainSpectrumGUI; QObject::connect( mainSpectrumGUI, &MainSpectrumGUI::moveToWorkspace, - this, - [this, mainSpectrumGUI](int wsIndexDest){ this->mainSpectrumMove(mainSpectrumGUI, wsIndexDest); } + m_mainWindow, + [m_mainWindow=m_mainWindow, mainSpectrumGUI](int wsIndexDest){ m_mainWindow->mainSpectrumMove(mainSpectrumGUI, wsIndexDest); } ); QObject::connect( - m_deviceUIs.back()->m_deviceGUI, + m_deviceUISet->m_deviceGUI, &DeviceGUI::addChannelEmitted, - this, - [this, deviceWorkspace, deviceSetIndex](int channelPluginIndex){ this->channelAddClicked(deviceWorkspace, deviceSetIndex, channelPluginIndex); } + m_mainWindow, + [m_mainWindow=m_mainWindow, m_deviceWorkspace=m_deviceWorkspace, m_deviceSetIndex=m_deviceSetIndex](int channelPluginIndex){ + m_mainWindow->channelAddClicked(m_deviceWorkspace, m_deviceSetIndex, channelPluginIndex); + } ); QObject::connect( mainSpectrumGUI, &MainSpectrumGUI::requestCenterFrequency, - this, + m_mainWindow, &MainWindow::mainSpectrumRequestDeviceCenterFrequency ); QObject::connect( - deviceAPI, + m_deviceAPI, &DeviceAPI::stateChanged, - this, + m_mainWindow, + &MainWindow::deviceStateChanged + ); + + m_deviceWorkspace->addToMdiArea(m_deviceUISet->m_deviceGUI); + m_spectrumWorkspace->addToMdiArea(m_deviceUISet->m_mainSpectrumGUI); + m_mainWindow->loadDefaultPreset(m_deviceAPI->getSamplingDeviceId(), m_deviceUISet); + emit m_mainWindow->m_mainCore->deviceSetAdded(m_deviceSetIndex, m_deviceAPI); + +#ifdef ANDROID + // Seemingly needed on some versions of Android, otherwise the new windows aren't always displayed?? + m_deviceWorkspace->repaint(); +#endif +} + +AddSampleSinkFSM::AddSampleSinkFSM(MainWindow *mainWindow, Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex, bool loadDefaults, QObject *parent) : + MainWindowFSM(mainWindow, parent), + m_deviceWorkspace(deviceWorkspace), + m_spectrumWorkspace(spectrumWorkspace), + m_deviceIndex(deviceIndex), + m_loadDefaults(loadDefaults), + m_deviceSetIndex(-1), + m_deviceAPI(nullptr), + m_deviceUISet(nullptr) +{ + // Create source engine + addEngine(); + + // Create FSM + createStates(3); + + m_states[0]->addTransition(m_dspDeviceSinkEngine, &DSPDeviceSinkEngine::sampleSet, m_states[1]); + m_states[1]->addTransition(m_finalState); + + connect(m_states[0], &QState::entered, this, &AddSampleSinkFSM::addDevice); + connect(m_states[1], &QState::entered, this, &AddSampleSinkFSM::addDeviceUI); +} + +void AddSampleSinkFSM::addEngine() +{ + // Create the source engine + m_dspDeviceSinkEngine = m_mainWindow->m_dspEngine->addDeviceSinkEngine(); +} + +void AddSampleSinkFSM::addDevice() +{ + m_deviceSetIndex = (int) m_mainWindow->m_deviceUIs.size(); + m_mainWindow->m_mainCore->appendDeviceSet(1); + + DeviceSet *deviceSet = m_mainWindow->m_mainCore->getDeviceSets().back(); + m_deviceUISet = new DeviceUISet(m_deviceSetIndex, deviceSet); + m_mainWindow->m_deviceUIs.push_back(m_deviceUISet); + + m_deviceUISet->m_deviceSourceEngine = nullptr; + deviceSet->m_deviceSourceEngine = nullptr; + m_deviceUISet->m_deviceSinkEngine = m_dspDeviceSinkEngine; + deviceSet->m_deviceSinkEngine = m_dspDeviceSinkEngine; + m_deviceUISet->m_deviceMIMOEngine = nullptr; + deviceSet->m_deviceMIMOEngine = nullptr; + + m_deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleTx, m_deviceSetIndex, nullptr, m_dspDeviceSinkEngine, nullptr); + + m_deviceUISet->m_deviceAPI = m_deviceAPI; + deviceSet->m_deviceAPI = m_deviceAPI; + QList channelNames; + m_mainWindow->m_pluginManager->listTxChannels(channelNames); + m_deviceUISet->setNumberOfAvailableTxChannels(channelNames.size()); + + m_dspDeviceSinkEngine->addSpectrumSink(m_deviceUISet->m_spectrumVis); + m_deviceUISet->m_spectrum->setDisplayedStream(false, 0); + + // Create a file sink instance by default if requested device was not enumerated (index = -1) + if (m_deviceIndex < 0) { + m_deviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex(); + } + + m_mainWindow->sampleSinkCreate(m_deviceSetIndex, m_deviceIndex, m_deviceUISet); +} + +void AddSampleSinkFSM::addDeviceUI() +{ + m_mainWindow->sampleSinkCreateUI(m_deviceSetIndex, m_deviceIndex, m_deviceUISet); + + m_deviceUISet->m_deviceGUI->setWorkspaceIndex(m_deviceWorkspace->getIndex()); + m_deviceUISet->m_mainSpectrumGUI->setWorkspaceIndex(m_spectrumWorkspace->getIndex()); + MainSpectrumGUI *mainSpectrumGUI = m_deviceUISet->m_mainSpectrumGUI; + + QObject::connect( + mainSpectrumGUI, + &MainSpectrumGUI::moveToWorkspace, + m_mainWindow, + [m_mainWindow=m_mainWindow, mainSpectrumGUI](int wsIndexDest){ m_mainWindow->mainSpectrumMove(mainSpectrumGUI, wsIndexDest); } + ); + + QObject::connect( + m_deviceUISet->m_deviceGUI, + &DeviceGUI::addChannelEmitted, + m_mainWindow, + [m_mainWindow=m_mainWindow, m_deviceWorkspace=m_deviceWorkspace, m_deviceSetIndex=m_deviceSetIndex](int channelPluginIndex){ + m_mainWindow->channelAddClicked(m_deviceWorkspace, m_deviceSetIndex, channelPluginIndex); + } + ); + + QObject::connect( + mainSpectrumGUI, + &MainSpectrumGUI::requestCenterFrequency, + m_mainWindow, + &MainWindow::mainSpectrumRequestDeviceCenterFrequency + ); + + QObject::connect( + m_deviceAPI, + &DeviceAPI::stateChanged, + m_mainWindow, + &MainWindow::deviceStateChanged + ); + + m_deviceWorkspace->addToMdiArea(m_deviceUISet->m_deviceGUI); + m_spectrumWorkspace->addToMdiArea(m_deviceUISet->m_mainSpectrumGUI); + m_mainWindow->loadDefaultPreset(m_deviceAPI->getSamplingDeviceId(), m_deviceUISet); + emit m_mainWindow->m_mainCore->deviceSetAdded(m_deviceSetIndex, m_deviceAPI); + +#ifdef ANDROID + // Seemingly needed on some versions of Android, otherwise the new windows aren't always displayed?? + m_deviceWorkspace->repaint(); +#endif +} + +AddSampleMIMOFSM::AddSampleMIMOFSM(MainWindow *mainWindow, Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex, bool loadDefaults, QObject *parent) : + MainWindowFSM(mainWindow, parent), + m_deviceWorkspace(deviceWorkspace), + m_spectrumWorkspace(spectrumWorkspace), + m_deviceIndex(deviceIndex), + m_loadDefaults(loadDefaults), + m_deviceSetIndex(-1), + m_deviceAPI(nullptr), + m_deviceUISet(nullptr) +{ + // Create source engine + addEngine(); + + // Create FSM + createStates(3); + + m_states[0]->addTransition(m_dspDeviceMIMOEngine, &DSPDeviceMIMOEngine::sampleSet, m_states[1]); + m_states[1]->addTransition(m_finalState); + + connect(m_states[0], &QState::entered, this, &AddSampleMIMOFSM::addDevice); + connect(m_states[1], &QState::entered, this, &AddSampleMIMOFSM::addDeviceUI); +} + +void AddSampleMIMOFSM::addEngine() +{ + // Create the source engine + m_dspDeviceMIMOEngine = m_mainWindow->m_dspEngine->addDeviceMIMOEngine(); +} + +void AddSampleMIMOFSM::addDevice() +{ + m_deviceSetIndex = (int) m_mainWindow->m_deviceUIs.size(); + m_mainWindow->m_mainCore->appendDeviceSet(2); + + DeviceSet *deviceSet = m_mainWindow->m_mainCore->getDeviceSets().back(); + m_deviceUISet = new DeviceUISet(m_deviceSetIndex, deviceSet); + m_mainWindow->m_deviceUIs.push_back(m_deviceUISet); + + m_deviceUISet->m_deviceSourceEngine = nullptr; + deviceSet->m_deviceSourceEngine = nullptr; + m_deviceUISet->m_deviceSinkEngine = nullptr; + deviceSet->m_deviceSinkEngine = nullptr; + m_deviceUISet->m_deviceMIMOEngine = m_dspDeviceMIMOEngine; + deviceSet->m_deviceMIMOEngine = m_dspDeviceMIMOEngine; + + m_deviceAPI = new DeviceAPI(DeviceAPI::StreamMIMO, m_deviceSetIndex, nullptr, nullptr, m_dspDeviceMIMOEngine); + + m_deviceUISet->m_deviceAPI = m_deviceAPI; + deviceSet->m_deviceAPI = m_deviceAPI; + QList mimoChannelNames; + m_mainWindow->m_pluginManager->listMIMOChannels(mimoChannelNames); + m_deviceUISet->setNumberOfAvailableMIMOChannels(mimoChannelNames.size()); + // Add Rx channels + QList rxChannelNames; + m_mainWindow->m_pluginManager->listRxChannels(rxChannelNames); + m_deviceUISet->setNumberOfAvailableRxChannels(rxChannelNames.size()); + // Add Tx channels + QList txChannelNames; + m_mainWindow->m_pluginManager->listTxChannels(txChannelNames); + m_deviceUISet->setNumberOfAvailableTxChannels(txChannelNames.size()); + + m_dspDeviceMIMOEngine->addSpectrumSink(m_deviceUISet->m_spectrumVis); + + // Create a Test MIMO instance by default if requested device was not enumerated (index = -1) + if (m_deviceIndex < 0) { + m_deviceIndex = DeviceEnumerator::instance()->getTestMIMODeviceIndex(); + } + + m_mainWindow->sampleMIMOCreate(m_deviceSetIndex, m_deviceIndex, m_deviceUISet); +} + +void AddSampleMIMOFSM::addDeviceUI() +{ + m_mainWindow->sampleMIMOCreateUI(m_deviceSetIndex, m_deviceIndex, m_deviceUISet); + + m_deviceUISet->m_deviceGUI->setWorkspaceIndex(m_deviceWorkspace->getIndex()); + m_deviceUISet->m_mainSpectrumGUI->setWorkspaceIndex(m_spectrumWorkspace->getIndex()); + MainSpectrumGUI *mainSpectrumGUI = m_deviceUISet->m_mainSpectrumGUI; + + QObject::connect( + m_deviceUISet->m_deviceGUI, + &DeviceGUI::addChannelEmitted, + m_mainWindow, + [m_mainWindow=m_mainWindow, m_deviceWorkspace=m_deviceWorkspace, m_deviceSetIndex=m_deviceSetIndex](int channelPluginIndex){ + m_mainWindow->channelAddClicked(m_deviceWorkspace, m_deviceSetIndex, channelPluginIndex); + } + ); + + QObject::connect( + mainSpectrumGUI, + &MainSpectrumGUI::requestCenterFrequency, + m_mainWindow, + &MainWindow::mainSpectrumRequestDeviceCenterFrequency + ); + + QObject::connect( + m_deviceAPI, + &DeviceAPI::stateChanged, + m_mainWindow, &MainWindow::deviceStateChanged ); - deviceWorkspace->addToMdiArea(m_deviceUIs.back()->m_deviceGUI); - spectrumWorkspace->addToMdiArea(m_deviceUIs.back()->m_mainSpectrumGUI); - loadDefaultPreset(deviceAPI->getSamplingDeviceId(), m_deviceUIs.back()); - emit m_mainCore->deviceSetAdded(deviceSetIndex, deviceAPI); + m_deviceWorkspace->addToMdiArea(m_deviceUISet->m_deviceGUI); + m_spectrumWorkspace->addToMdiArea(m_deviceUISet->m_mainSpectrumGUI); + m_mainWindow->loadDefaultPreset(m_deviceAPI->getSamplingDeviceId(), m_deviceUISet); + emit m_mainWindow->m_mainCore->deviceSetAdded(m_deviceSetIndex, m_deviceAPI); #ifdef ANDROID // Seemingly needed on some versions of Android, otherwise the new windows aren't always displayed?? - deviceWorkspace->repaint(); + m_deviceWorkspace->repaint(); #endif } +RemoveDeviceSetFSM::RemoveDeviceSetFSM(MainWindow *mainWindow, int deviceSetIndex, QObject *parent) : + MainWindowFSM(mainWindow, parent), + m_deviceSetIndex(deviceSetIndex), + m_deviceSourceEngine(nullptr), + m_deviceSinkEngine(nullptr), + m_deviceMIMOEngine(nullptr), + m_t1(nullptr), + m_t2(nullptr) +{ + // Create FSM + createStates(6); + + m_deviceUISet = m_mainWindow->m_deviceUIs[m_deviceSetIndex]; + if (m_deviceUISet->m_deviceSourceEngine) + { + m_deviceSourceEngine = m_deviceUISet->m_deviceSourceEngine; + m_t1 = new QSignalTransition(m_deviceSourceEngine, &DSPDeviceSourceEngine::acquistionStopped, m_states[0]); + m_t1->setTargetState(m_states[1]); + m_t2 = new QSignalTransition(m_deviceSourceEngine, &DSPDeviceSourceEngine::sinkRemoved, m_states[1]); + m_t2->setTargetState(m_states[2]); + } + else if (m_deviceUISet->m_deviceSinkEngine) + { + m_deviceSinkEngine = m_deviceUISet->m_deviceSinkEngine; + m_t1 = new QSignalTransition(m_deviceSinkEngine, &DSPDeviceSinkEngine::generationStopped, m_states[0]); + m_t1->setTargetState(m_states[1]); + m_t2 = new QSignalTransition(m_deviceSinkEngine, &DSPDeviceSinkEngine::spectrumSinkRemoved, m_states[1]); + m_t2->setTargetState(m_states[2]); + } + else if (m_deviceUISet->m_deviceMIMOEngine) + { + m_deviceMIMOEngine = m_deviceUISet->m_deviceMIMOEngine; + m_t1 = new QSignalTransition(m_deviceMIMOEngine, &DSPDeviceMIMOEngine::acquisitionStopped, m_states[0]); + m_t1->setTargetState(m_states[1]); + m_t2 = new QSignalTransition(m_deviceMIMOEngine, &DSPDeviceMIMOEngine::spectrumSinkRemoved, m_states[1]); + m_t2->setTargetState(m_states[2]); + } + m_states[2]->addTransition(m_states[3]); + m_states[3]->addTransition(m_mainWindow, &MainWindow::engineStopped, m_states[4]); + m_states[4]->addTransition(m_finalState); + + connect(m_states[0], &QState::entered, this, &RemoveDeviceSetFSM::stopAcquisition); + connect(m_states[1], &QState::entered, this, &RemoveDeviceSetFSM::removeSink); + connect(m_states[2], &QState::entered, this, &RemoveDeviceSetFSM::removeUI); + connect(m_states[3], &QState::entered, this, &RemoveDeviceSetFSM::stopEngine); + connect(m_states[4], &QState::entered, this, &RemoveDeviceSetFSM::removeDeviceSet); +} + +void RemoveDeviceSetFSM::stopAcquisition() +{ + qDebug() << "RemoveDeviceSetFSM::stopAcquisition"; + if (m_deviceSourceEngine) + { + m_deviceSourceEngine->stopAcquistion(); + } + else if (m_deviceSinkEngine) + { + m_deviceSinkEngine->stopGeneration(); + } + else + { + m_deviceMIMOEngine->stopProcess(1); // Tx side + m_deviceMIMOEngine->stopProcess(0); // Rx side + } +} + +void RemoveDeviceSetFSM::removeSink() +{ + qDebug() << "RemoveDeviceSetFSM::removeSink"; + if (m_deviceSourceEngine) { + m_deviceSourceEngine->removeSink(m_deviceUISet->m_spectrumVis); + } else if (m_deviceSinkEngine) { + m_deviceSinkEngine->removeSpectrumSink(m_deviceUISet->m_spectrumVis); + } else { + m_deviceMIMOEngine->removeSpectrumSink(m_deviceUISet->m_spectrumVis); + } +} + +void RemoveDeviceSetFSM::removeUI() +{ + qDebug() << "RemoveDeviceSetFSM::removeUI"; + + // Remove transitions, as we will delete the object (DSPDevice*Engine) that is the source of these signals + m_states[0]->removeTransition(m_t1); + delete m_t1; + m_t1 = nullptr; + m_states[1]->removeTransition(m_t2); + delete m_t2; + m_t2 = nullptr; + + m_deviceUISet->freeChannels(); // destroys the channel instances + if (m_deviceSourceEngine) { + m_deviceUISet->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(nullptr); // have source stop sending messages to the GUI + } else if (m_deviceSinkEngine) { + m_deviceUISet->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI + } else { + m_deviceUISet->m_deviceAPI->getSampleMIMO()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI + } + delete m_deviceUISet->m_deviceGUI; + m_deviceUISet->m_deviceAPI->resetSamplingDeviceId(); + if (!m_deviceMIMOEngine) { + m_deviceUISet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists + } +} + +void RemoveDeviceSetFSM::stopEngine() +{ + qDebug() << "RemoveDeviceSetFSM::stopEngine"; + QThread *thread = m_mainWindow->m_dspEngine->removeDeviceEngineAt(m_deviceSetIndex); + if (thread && !thread->isFinished()) // FIXME: Is there a race condition here? We might need to connect before calling thread->exit + { + connect(thread, &QThread::finished, m_mainWindow, &MainWindow::engineStopped); + } + else + { + emit m_mainWindow->engineStopped(); + } +} + +void RemoveDeviceSetFSM::removeDeviceSet() +{ + if (m_deviceSourceEngine) { + DeviceEnumerator::instance()->removeRxSelection(m_deviceSetIndex); + } else if (m_deviceSinkEngine) { + DeviceEnumerator::instance()->removeTxSelection(m_deviceSetIndex); + } else { + DeviceEnumerator::instance()->removeMIMOSelection(m_deviceSetIndex); + } + + DeviceAPI *deviceAPI = m_deviceUISet->m_deviceAPI; + delete m_deviceUISet; + // FIXME: DSPEngine::addDeviceSourceEngine() used to setup deleteLater for these objects + // But that would cause crash on exit + if (m_deviceSourceEngine) { + delete deviceAPI->getSampleSource(); + } else if (m_deviceSinkEngine) { + delete deviceAPI->getSampleSink(); + } else { + delete deviceAPI->getSampleMIMO(); + } + delete deviceAPI; + + m_mainWindow->m_deviceUIs.erase(m_mainWindow->m_deviceUIs.begin() + m_deviceSetIndex); + m_mainWindow->m_mainCore->removeDeviceSet(m_deviceSetIndex); + DeviceEnumerator::instance()->renumeratetabIndex(m_deviceSetIndex); + + // Renumerate + for (int i = 0; i < (int) m_mainWindow->m_deviceUIs.size(); i++) + { + DeviceUISet *xDeviceUISet = m_mainWindow->m_deviceUIs[i]; + xDeviceUISet->setIndex(i); + const DeviceGUI *deviceGUI = m_mainWindow->m_deviceUIs[i]->m_deviceGUI; + Workspace *deviceWorkspace = m_mainWindow->m_workspaces[deviceGUI->getWorkspaceIndex()]; + + QObject::disconnect( + deviceGUI, + &DeviceGUI::addChannelEmitted, + this, + nullptr + ); + QObject::connect( + deviceGUI, + &DeviceGUI::addChannelEmitted, + this, + [this, deviceWorkspace, i](int channelPluginIndex){ m_mainWindow->channelAddClicked(deviceWorkspace, i, channelPluginIndex); } + ); + } + + emit m_mainWindow->m_mainCore->deviceSetRemoved(m_deviceSetIndex); +} + +RemoveAllDeviceSetsFSM::RemoveAllDeviceSetsFSM(MainWindow *mainWindow, QObject *parent) : + MainWindowFSM(mainWindow, parent) +{ + // Create FSM + createStates(2); + + m_states[0]->addTransition(m_mainWindow->m_mainCore, &MainCore::deviceSetRemoved, m_states[0]); + m_states[0]->addTransition(m_mainWindow, &MainWindow::allDeviceSetsRemoved, m_finalState); + + connect(m_states[0], &QState::entered, this, &RemoveAllDeviceSetsFSM::removeNext); +} + +void RemoveAllDeviceSetsFSM::removeNext() +{ + qDebug() << "RemoveAllDeviceSetsFSM::removeNext"; + if (m_mainWindow->m_deviceUIs.size() > 0) { + m_mainWindow->removeDeviceSet(m_mainWindow->m_deviceUIs.size() - 1); + } else { + emit m_mainWindow->allDeviceSetsRemoved(); + } +} + +RemoveAllWorkspacesFSM::RemoveAllWorkspacesFSM(MainWindow *mainWindow, QObject *parent) : + MainWindowFSM(mainWindow, parent) +{ + // Create FSM + createStates(3); + + m_removeAllDeviceSetsFSM = new RemoveAllDeviceSetsFSM(m_mainWindow, this); + + m_states[0]->addTransition(m_removeAllDeviceSetsFSM, &RemoveAllDeviceSetsFSM::finished, m_states[1]); + m_states[1]->addTransition(m_finalState); + + connect(m_states[0], &QState::entered, this, &RemoveAllWorkspacesFSM::removeDeviceSets); + connect(m_states[1], &QState::entered, this, &RemoveAllWorkspacesFSM::removeWorkspaces); +} + +void RemoveAllWorkspacesFSM::removeDeviceSets() +{ + qDebug() << "RemoveAllWorkspacesFSM::removeDeviceSets"; + m_removeAllDeviceSetsFSM->start(); +} + +void RemoveAllWorkspacesFSM::removeWorkspaces() +{ + qDebug() << "RemoveAllWorkspacesFSM::removeWorkspaces"; + // Features + m_mainWindow->m_featureUIs[0]->freeFeatures(); + // Workspaces + for (const auto& workspace : m_mainWindow->m_workspaces) { + delete workspace; + } + m_mainWindow->m_workspaces.clear(); + qDebug() << "RemoveAllWorkspacesFSM::removeWorkspaces done"; +} + +LoadConfigurationFSM::LoadConfigurationFSM(MainWindow *mainWindow, const Configuration *configuration, QProgressDialog *waitBox, QObject *parent) : + MainWindowFSM(mainWindow), + m_configuration(configuration), + m_waitBox(waitBox) +{ + // Create FSM + createStates(7); + + m_removeAllWorkspacesFSM = new RemoveAllWorkspacesFSM(m_mainWindow, this); + + m_states[0]->addTransition(m_removeAllWorkspacesFSM, &RemoveAllWorkspacesFSM::finished, m_states[1]); + m_states[1]->addTransition(m_states[2]); + m_states[2]->addTransition(m_mainWindow, &MainWindow::allDeviceSetsAdded, m_states[3]); + m_states[3]->addTransition(m_states[4]); + m_states[4]->addTransition(m_states[5]); + m_states[5]->addTransition(m_finalState); + + connect(m_states[0], &QState::entered, this, &LoadConfigurationFSM::clearWorkspace); + connect(m_states[1], &QState::entered, this, &LoadConfigurationFSM::createWorkspaces); + connect(m_states[2], &QState::entered, this, &LoadConfigurationFSM::loadDeviceSets); + connect(m_states[3], &QState::entered, this, &LoadConfigurationFSM::loadDeviceSetSettings); + connect(m_states[4], &QState::entered, this, &LoadConfigurationFSM::loadFeatureSets); + connect(m_states[5], &QState::entered, this, &LoadConfigurationFSM::restoreGeometry); +} + +void LoadConfigurationFSM::clearWorkspace() +{ + qDebug() << "LoadConfigurationFSM::clearWorkspace"; + + if (m_waitBox) + { + m_waitBox->setLabelText("Deleting existing..."); + m_waitBox->setValue(5); + } + + m_removeAllWorkspacesFSM->start(); +} + +void LoadConfigurationFSM::createWorkspaces() +{ + qDebug() << "LoadConfigurationFSM::createWorkspaces"; + + if (m_waitBox) + { + m_waitBox->setLabelText("Creating workspaces..."); + m_waitBox->setValue(20); + } + + // Workspaces + for (int i = 0; i < m_configuration->getNumberOfWorkspaceGeometries(); i++) + { + m_mainWindow->addWorkspace(); + m_mainWindow->m_workspaces[i]->setAutoStackOption(m_configuration->getWorkspaceAutoStackOptions()[i]); + m_mainWindow->m_workspaces[i]->setTabSubWindowsOption(m_configuration->getWorkspaceTabSubWindowsOptions()[i]); + } + + if (m_mainWindow->m_workspaces.size() <= 0) { // cannot go further if there are no workspaces + // FIXME: How to terminate FSM?? Need extra transition to final + } +} + +void LoadConfigurationFSM::loadDeviceSets() +{ + qDebug() << "LoadConfigurationFSM::loadDeviceSets"; + + if (m_waitBox) + { + m_waitBox->setLabelText("Loading device sets..."); + m_waitBox->setValue(25); + } + + const QList& deviceSetPresets = m_configuration->getDeviceSetPresets(); + + // State machine that runs all of the individual AddSampleSourceFSM, AddSampleSinkFSM, AddSampleMIMOFSMs + QStateMachine *m_addDevicesFSM = new QStateMachine(); + QState *sInitial = nullptr; + QState *sPrev = nullptr; + QFinalState *sFinal = new QFinalState(); + + connect(m_addDevicesFSM, &QStateMachine::finished, this, [=](){emit m_mainWindow->allDeviceSetsAdded();}); + connect(m_addDevicesFSM, &QStateMachine::finished, m_addDevicesFSM, &QStateMachine::deleteLater); + + for (const auto& deviceSetPreset : deviceSetPresets) + { + MainWindowFSM *fsm = nullptr; + int deviceWorkspaceIndex = deviceSetPreset.getDeviceWorkspaceIndex() < m_mainWindow->m_workspaces.size() ? + deviceSetPreset.getDeviceWorkspaceIndex() : + 0; + int spectrumWorkspaceIndex = deviceSetPreset.getSpectrumWorkspaceIndex() < m_mainWindow->m_workspaces.size() ? + deviceSetPreset.getSpectrumWorkspaceIndex() : + deviceWorkspaceIndex; + + if (deviceSetPreset.isSourcePreset()) + { + int bestDeviceIndex = DeviceEnumerator::instance()->getBestRxSamplingDeviceIndex( + deviceSetPreset.getSelectedDevice().m_deviceId, + deviceSetPreset.getSelectedDevice().m_deviceSerial, + deviceSetPreset.getSelectedDevice().m_deviceSequence, + deviceSetPreset.getSelectedDevice().m_deviceItemIndex + ); + qDebug("MainWindow::loadConfiguration: add source %s in workspace %d spectrum in %d", + qPrintable(deviceSetPreset.getSelectedDevice().m_deviceId), + deviceSetPreset.getDeviceWorkspaceIndex(), + deviceSetPreset.getSpectrumWorkspaceIndex()); + + fsm = new AddSampleSourceFSM(m_mainWindow, + m_mainWindow->m_workspaces[deviceWorkspaceIndex], + m_mainWindow->m_workspaces[spectrumWorkspaceIndex], + bestDeviceIndex, false, m_addDevicesFSM); + } + else if (deviceSetPreset.isSinkPreset()) + { + int bestDeviceIndex = DeviceEnumerator::instance()->getBestTxSamplingDeviceIndex( + deviceSetPreset.getSelectedDevice().m_deviceId, + deviceSetPreset.getSelectedDevice().m_deviceSerial, + deviceSetPreset.getSelectedDevice().m_deviceSequence, + deviceSetPreset.getSelectedDevice().m_deviceItemIndex + ); + qDebug("MainWindow::loadConfiguration: add sink %s in workspace %d spectrum in %d", + qPrintable(deviceSetPreset.getSelectedDevice().m_deviceId), + deviceSetPreset.getDeviceWorkspaceIndex(), + deviceSetPreset.getSpectrumWorkspaceIndex()); + + fsm = new AddSampleSinkFSM(m_mainWindow, + m_mainWindow->m_workspaces[deviceWorkspaceIndex], + m_mainWindow->m_workspaces[spectrumWorkspaceIndex], + bestDeviceIndex, false, m_addDevicesFSM); + } + else if (deviceSetPreset.isMIMOPreset()) + { + int bestDeviceIndex = DeviceEnumerator::instance()->getBestMIMOSamplingDeviceIndex( + deviceSetPreset.getSelectedDevice().m_deviceId, + deviceSetPreset.getSelectedDevice().m_deviceSerial, + deviceSetPreset.getSelectedDevice().m_deviceSequence + ); + qDebug("MainWindow::loadConfiguration: add MIMO %s in workspace %d spectrum in %d", + qPrintable(deviceSetPreset.getSelectedDevice().m_deviceId), + deviceSetPreset.getDeviceWorkspaceIndex(), + deviceSetPreset.getSpectrumWorkspaceIndex()); + + fsm = new AddSampleMIMOFSM(m_mainWindow, + m_mainWindow->m_workspaces[deviceWorkspaceIndex], + m_mainWindow->m_workspaces[spectrumWorkspaceIndex], + bestDeviceIndex, false, m_addDevicesFSM); + } + else + { + qDebug() << "MainWindow::loadConfiguration: Unknown preset type: " << deviceSetPreset.getPresetType(); + } + + // Chain the FSMs together + if (fsm) + { + m_addDevicesFSM->addState(fsm); + + if (!sInitial) { + sInitial = fsm; + } + if (sPrev) { + sPrev->addTransition(sPrev, &QState::finished, fsm); + } + sPrev = fsm; + } + } + + m_addDevicesFSM->addState(sFinal); + if (sPrev) + { + m_addDevicesFSM->setInitialState(sInitial); + sPrev->addTransition(sPrev, &QState::finished, sFinal); + } + else + { + m_addDevicesFSM->setInitialState(sFinal); + } + // Run all the FSMs + m_addDevicesFSM->start(); +} + +void LoadConfigurationFSM::loadDeviceSetSettings() +{ + qDebug() << "LoadConfigurationFSM::loadDeviceSetSettings"; + + if (m_waitBox) + { + m_waitBox->setLabelText("Loading device set settings..."); + m_waitBox->setValue(70); + } + + const QList& deviceSetPresets = m_configuration->getDeviceSetPresets(); + + int deviceSetIndex = 0; + for (const auto& deviceSetPreset : deviceSetPresets) + { + if (m_mainWindow->m_deviceUIs.size() > deviceSetIndex) + { + MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_deviceGUI, deviceSetPreset.getDeviceGeometry()); + MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI, deviceSetPreset.getSpectrumGeometry()); + m_mainWindow->m_deviceUIs[deviceSetIndex]->loadDeviceSetSettings(&deviceSetPreset, m_mainWindow->m_pluginManager->getPluginAPI(), &m_mainWindow->m_workspaces, nullptr); + deviceSetIndex++; + } + } +} + +void LoadConfigurationFSM::loadFeatureSets() +{ + qDebug() << "LoadConfigurationFSM::loadFeatureSets"; + + if (m_waitBox) + { + m_waitBox->setLabelText("Loading feature sets..."); + m_waitBox->setValue(75); + } + + m_mainWindow->m_featureUIs[0]->loadFeatureSetSettings( + &m_configuration->getFeatureSetPreset(), + m_mainWindow->m_pluginManager->getPluginAPI(), + m_mainWindow->m_apiAdapter, + &m_mainWindow->m_workspaces, + nullptr + ); + + for (int i = 0; i < m_mainWindow->m_featureUIs[0]->getNumberOfFeatures(); i++) + { + FeatureGUI *gui = m_mainWindow->m_featureUIs[0]->getFeatureGuiAt(i); + QObject::connect( + gui, + &FeatureGUI::moveToWorkspace, + this, + [m_mainWindow=m_mainWindow, gui](int wsIndexDest){ m_mainWindow->featureMove(gui, wsIndexDest); } + ); + } +} + +void LoadConfigurationFSM::restoreGeometry() +{ + qDebug() << "LoadConfigurationFSM::restoreGeometry"; + + // Lastly restore workspaces geometry + if (m_waitBox) + { + m_waitBox->setValue(90); + m_waitBox->setLabelText("Finalizing..."); + } + + for (int i = 0; i < m_configuration->getNumberOfWorkspaceGeometries(); i++) + { + m_mainWindow->m_workspaces[i]->restoreGeometry(m_configuration->getWorkspaceGeometries()[i]); + m_mainWindow->m_workspaces[i]->restoreGeometry(m_configuration->getWorkspaceGeometries()[i]); + m_mainWindow->m_workspaces[i]->adjustSubWindowsAfterRestore(); +#ifdef ANDROID + // On Android, workspaces seem to be restored to 0,20, rather than 0,0 + m_mainWindow->m_workspaces[i]->move(m_workspaces[i]->pos().x(), 0); + // Need to call updateGeometry, otherwise sometimes the layout is corrupted + m_mainWindow->m_workspaces[i]->updateGeometry(); +#endif + if (m_mainWindow->m_workspaces[i]->getAutoStackOption()) { + m_mainWindow->m_workspaces[i]->layoutSubWindows(); + } + } + + if (m_waitBox) { + m_waitBox->setValue(100); + } +} + +InitFSM::InitFSM(MainWindow *mainWindow, SDRangelSplash *splash, bool loadDefault, QObject *parent) : + MainWindowFSM(mainWindow, parent), + m_splash(splash) +{ + // Create FSM + createStates(2); + + m_loadConfigurationFSM = new LoadConfigurationFSM(m_mainWindow, m_mainWindow->m_mainCore->getMutableSettings().getWorkingConfiguration(), nullptr, this); + + m_states[0]->addTransition(m_loadConfigurationFSM, &LoadConfigurationFSM::finished, m_finalState); + + connect(m_states[0], &QState::entered, this, &InitFSM::loadDefaultConfiguration); + connect(m_finalState, &QState::entered, this, &InitFSM::showDefaultConfigurations); +} + +void InitFSM::loadDefaultConfiguration() +{ + m_splash->showStatusMessage("load current configuration...", Qt::white); + qDebug() << "MainWindow::MainWindow: load current configuration..."; + m_loadConfigurationFSM->start(); +} + +void InitFSM::showDefaultConfigurations() +{ + QApplication::restoreOverrideCursor(); + //m_mainWindow->show(); + + if (m_mainWindow->m_workspaces.size() == 0) + { + qDebug() << "MainWindow::MainWindow: no or empty current configuration, creating empty workspace..."; + m_mainWindow->addWorkspace(); + + // If no configurations, load some basic examples + if (m_mainWindow->m_mainCore->getMutableSettings().getConfigurations()->size() == 0) { + m_mainWindow->loadDefaultConfigurations(); + } +#if defined(ANDROID) || defined(__EMSCRIPTEN__) + // Show welcome dialog + m_mainWindow->on_action_Welcome_triggered(); +#endif + // Show configurations + m_mainWindow->openConfigurationDialog(true); +} +} + +CloseFSM::CloseFSM(MainWindow *mainWindow, QObject *parent) : + MainWindowFSM(mainWindow, parent) +{ + // Create FSM + createStates(2); + + m_states[0]->addTransition(m_mainWindow, &MainWindow::allDeviceSetsRemoved, m_finalState); + + connect(this, &QStateMachine::started, this, &CloseFSM::on_started); + connect(this, &QStateMachine::finished, this, &CloseFSM::on_finished); +} + +void CloseFSM::on_started() +{ + m_mainWindow->removeAllDeviceSets(); +} + +void CloseFSM::on_finished() +{ + m_mainWindow->close(); +} + +void MainWindow::sampleSourceAdd(Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex) +{ + AddSampleSourceFSM *fsm = new AddSampleSourceFSM(this, deviceWorkspace, spectrumWorkspace, deviceIndex, true); + connect(fsm, &AddSampleSourceFSM::finished, fsm, &AddSampleSourceFSM::deleteLater); + fsm->start(); +} + void MainWindow::sampleSourceCreate( int deviceSetIndex, int deviceIndex, @@ -486,6 +1310,17 @@ void MainWindow::sampleSourceCreate( DeviceSampleSource *source = deviceAPI->getPluginInterface()->createSampleSourcePluginInstance( deviceAPI->getSamplingDeviceId(), deviceAPI); deviceAPI->setSampleSource(source); +} + +void MainWindow::sampleSourceCreateUI( + int deviceSetIndex, + int deviceIndex, + DeviceUISet *deviceUISet +) +{ + DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; + int selectedDeviceIndex = deviceIndex; + const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); QWidget *gui; DeviceGUI *deviceGUI = deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( deviceAPI->getSamplingDeviceId(), @@ -530,96 +1365,36 @@ void MainWindow::sampleSourceCreate( ); deviceAPI->getSampleSource()->setMessageQueueToGUI(deviceGUI->getInputMessageQueue()); - deviceUISet->m_deviceGUI = deviceGUI; - const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex); - deviceUISet->m_selectedDeviceId = selectedDevice->id; - deviceUISet->m_selectedDeviceSerial = selectedDevice->serial; - deviceUISet->m_selectedDeviceSequence = selectedDevice->sequence; - deviceUISet->m_selectedDeviceItemImdex = selectedDevice->deviceItemIndex; - deviceUISet->m_deviceAPI->getSampleSource()->init(); - // Finalize GUI setup and add it to workspace MDI - deviceGUI->setDeviceType(DeviceGUI::DeviceRx); - deviceGUI->setIndex(deviceSetIndex); - deviceGUI->setToolTip(samplingDevice->displayedName); - deviceGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); - deviceGUI->setCurrentDeviceIndex(selectedDeviceIndex); - QStringList channelNames; - m_pluginManager->listRxChannels(channelNames); - deviceGUI->setChannelNames(channelNames); - MainSpectrumGUI *mainSpectrumGUI = deviceUISet->m_mainSpectrumGUI; - mainSpectrumGUI->setDeviceType(MainSpectrumGUI::DeviceRx); - mainSpectrumGUI->setIndex(deviceSetIndex); - mainSpectrumGUI->setToolTip(samplingDevice->displayedName); - mainSpectrumGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); -} - -void MainWindow::sampleSinkAdd(Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex) -{ - DSPDeviceSinkEngine *dspDeviceSinkEngine = m_dspEngine->addDeviceSinkEngine(); - auto deviceSetIndex = (int) m_deviceUIs.size(); - m_mainCore->appendDeviceSet(1); - m_deviceUIs.push_back(new DeviceUISet(deviceSetIndex, m_mainCore->m_deviceSets.back())); - m_deviceUIs.back()->m_deviceSourceEngine = nullptr; - m_mainCore->m_deviceSets.back()->m_deviceSourceEngine = nullptr; - m_deviceUIs.back()->m_deviceSinkEngine = dspDeviceSinkEngine; - m_mainCore->m_deviceSets.back()->m_deviceSinkEngine = dspDeviceSinkEngine; - m_deviceUIs.back()->m_deviceMIMOEngine = nullptr; - m_mainCore->m_deviceSets.back()->m_deviceMIMOEngine = nullptr; - - auto *deviceAPI = new DeviceAPI(DeviceAPI::StreamSingleTx, deviceSetIndex, nullptr, dspDeviceSinkEngine, nullptr); - - m_deviceUIs.back()->m_deviceAPI = deviceAPI; - m_mainCore->m_deviceSets.back()->m_deviceAPI = deviceAPI; - QList channelNames; - m_pluginManager->listTxChannels(channelNames); - m_deviceUIs.back()->setNumberOfAvailableTxChannels(channelNames.size()); - - dspDeviceSinkEngine->addSpectrumSink(m_deviceUIs.back()->m_spectrumVis); - m_deviceUIs.back()->m_spectrum->setDisplayedStream(false, 0); - - if (deviceIndex < 0) { - deviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex(); // create a file output by default - } - - sampleSinkCreate(deviceSetIndex, deviceIndex, m_deviceUIs.back()); - m_deviceUIs.back()->m_deviceGUI->setWorkspaceIndex(deviceWorkspace->getIndex()); - m_deviceUIs.back()->m_mainSpectrumGUI->setWorkspaceIndex(spectrumWorkspace->getIndex()); - MainSpectrumGUI *mainSpectrumGUI = m_deviceUIs.back()->m_mainSpectrumGUI; - - QObject::connect( - mainSpectrumGUI, - &MainSpectrumGUI::moveToWorkspace, - this, - [this, mainSpectrumGUI](int wsIndexDest){ this->mainSpectrumMove(mainSpectrumGUI, wsIndexDest); } - ); - - QObject::connect( - m_deviceUIs.back()->m_deviceGUI, - &DeviceGUI::addChannelEmitted, - this, - [this, deviceWorkspace, deviceSetIndex](int channelPluginIndex){ this->channelAddClicked(deviceWorkspace, deviceSetIndex, channelPluginIndex); } - ); - - QObject::connect( - mainSpectrumGUI, - &MainSpectrumGUI::requestCenterFrequency, - this, - &MainWindow::mainSpectrumRequestDeviceCenterFrequency - ); - - QObject::connect( - deviceAPI, - &DeviceAPI::stateChanged, - this, - &MainWindow::deviceStateChanged - ); - - deviceWorkspace->addToMdiArea(m_deviceUIs.back()->m_deviceGUI); - spectrumWorkspace->addToMdiArea(m_deviceUIs.back()->m_mainSpectrumGUI); - loadDefaultPreset(deviceAPI->getSamplingDeviceId(), m_deviceUIs.back()); - emit m_mainCore->deviceSetAdded(deviceSetIndex, deviceAPI); + deviceUISet->m_deviceGUI = deviceGUI; + const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex); + deviceUISet->m_selectedDeviceId = selectedDevice->id; + deviceUISet->m_selectedDeviceSerial = selectedDevice->serial; + deviceUISet->m_selectedDeviceSequence = selectedDevice->sequence; + deviceUISet->m_selectedDeviceItemImdex = selectedDevice->deviceItemIndex; + deviceUISet->m_deviceAPI->getSampleSource()->init(); + // Finalize GUI setup and add it to workspace MDI + deviceGUI->setDeviceType(DeviceGUI::DeviceRx); + deviceGUI->setIndex(deviceSetIndex); + deviceGUI->setToolTip(samplingDevice->displayedName); + deviceGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); + deviceGUI->setCurrentDeviceIndex(selectedDeviceIndex); + QStringList channelNames; + m_pluginManager->listRxChannels(channelNames); + deviceGUI->setChannelNames(channelNames); + MainSpectrumGUI *mainSpectrumGUI = deviceUISet->m_mainSpectrumGUI; + mainSpectrumGUI->setDeviceType(MainSpectrumGUI::DeviceRx); + mainSpectrumGUI->setIndex(deviceSetIndex); + mainSpectrumGUI->setToolTip(samplingDevice->displayedName); + mainSpectrumGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); } +void MainWindow::sampleSinkAdd(Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex) +{ + AddSampleSinkFSM *fsm = new AddSampleSinkFSM(this, deviceWorkspace, spectrumWorkspace, deviceIndex, true); + connect(fsm, &AddSampleSinkFSM::finished, fsm, &AddSampleSinkFSM::deleteLater); + fsm->start(); + } + void MainWindow::sampleSinkCreate( int deviceSetIndex, int deviceIndex, @@ -693,6 +1468,17 @@ void MainWindow::sampleSinkCreate( DeviceSampleSink *sink = deviceAPI->getPluginInterface()->createSampleSinkPluginInstance( deviceAPI->getSamplingDeviceId(), deviceAPI); deviceAPI->setSampleSink(sink); +} + +void MainWindow::sampleSinkCreateUI( + int deviceSetIndex, + int deviceIndex, + DeviceUISet *deviceUISet +) +{ + DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; + int selectedDeviceIndex = deviceIndex; + const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceIndex); QWidget *gui; DeviceGUI *deviceGUI = deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI( deviceAPI->getSamplingDeviceId(), @@ -762,73 +1548,11 @@ void MainWindow::sampleSinkCreate( void MainWindow::sampleMIMOAdd(Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex) { - DSPDeviceMIMOEngine *dspDeviceMIMOEngine = m_dspEngine->addDeviceMIMOEngine(); - - auto deviceSetIndex = (int) m_deviceUIs.size(); - m_mainCore->appendDeviceSet(2); - m_deviceUIs.push_back(new DeviceUISet(deviceSetIndex, m_mainCore->m_deviceSets.back())); - m_deviceUIs.back()->m_deviceSourceEngine = nullptr; - m_mainCore->m_deviceSets.back()->m_deviceSourceEngine = nullptr; - m_deviceUIs.back()->m_deviceSinkEngine = nullptr; - m_mainCore->m_deviceSets.back()->m_deviceSinkEngine = nullptr; - m_deviceUIs.back()->m_deviceMIMOEngine = dspDeviceMIMOEngine; - m_mainCore->m_deviceSets.back()->m_deviceMIMOEngine = dspDeviceMIMOEngine; - - auto *deviceAPI = new DeviceAPI(DeviceAPI::StreamMIMO, deviceSetIndex, nullptr, nullptr, dspDeviceMIMOEngine); - - m_deviceUIs.back()->m_deviceAPI = deviceAPI; - m_mainCore->m_deviceSets.back()->m_deviceAPI = deviceAPI; - // add MIMO channels - QList mimoChannelNames; - m_pluginManager->listMIMOChannels(mimoChannelNames); - m_deviceUIs.back()->setNumberOfAvailableMIMOChannels(mimoChannelNames.size()); - // Add Rx channels - QList rxChannelNames; - m_pluginManager->listRxChannels(rxChannelNames); - m_deviceUIs.back()->setNumberOfAvailableRxChannels(rxChannelNames.size()); - // Add Tx channels - QList txChannelNames; - m_pluginManager->listTxChannels(txChannelNames); - m_deviceUIs.back()->setNumberOfAvailableTxChannels(txChannelNames.size()); - - dspDeviceMIMOEngine->addSpectrumSink(m_deviceUIs.back()->m_spectrumVis); - - if (deviceIndex < 0) { - deviceIndex = DeviceEnumerator::instance()->getTestMIMODeviceIndex(); // create a test MIMO by default + AddSampleMIMOFSM *fsm = new AddSampleMIMOFSM(this, deviceWorkspace, spectrumWorkspace, deviceIndex, true); + connect(fsm, &AddSampleMIMOFSM::finished, fsm, &AddSampleSinkFSM::deleteLater); + fsm->start(); } - sampleMIMOCreate(deviceSetIndex, deviceIndex, m_deviceUIs.back()); - m_deviceUIs.back()->m_deviceGUI->setWorkspaceIndex(deviceWorkspace->getIndex()); - m_deviceUIs.back()->m_mainSpectrumGUI->setWorkspaceIndex(spectrumWorkspace->getIndex()); - MainSpectrumGUI *mainSpectrumGUI = m_deviceUIs.back()->m_mainSpectrumGUI; - - QObject::connect( - mainSpectrumGUI, - &MainSpectrumGUI::moveToWorkspace, - this, - [this, mainSpectrumGUI](int wsIndexDest){ this->mainSpectrumMove(mainSpectrumGUI, wsIndexDest); } - ); - - QObject::connect( - m_deviceUIs.back()->m_deviceGUI, - &DeviceGUI::addChannelEmitted, - this, - [this, deviceWorkspace, deviceSetIndex](int channelPluginIndex){ this->channelAddClicked(deviceWorkspace, deviceSetIndex, channelPluginIndex); } - ); - - QObject::connect( - deviceAPI, - &DeviceAPI::stateChanged, - this, - &MainWindow::deviceStateChanged - ); - - deviceWorkspace->addToMdiArea(m_deviceUIs.back()->m_deviceGUI); - spectrumWorkspace->addToMdiArea(m_deviceUIs.back()->m_mainSpectrumGUI); - loadDefaultPreset(deviceAPI->getSamplingDeviceId(), m_deviceUIs.back()); - emit m_mainCore->deviceSetAdded(deviceSetIndex, deviceAPI); -} - void MainWindow::sampleMIMOCreate( int deviceSetIndex, int deviceIndex, @@ -883,6 +1607,17 @@ void MainWindow::sampleMIMOCreate( DeviceSampleMIMO *mimo = deviceAPI->getPluginInterface()->createSampleMIMOPluginInstance( deviceAPI->getSamplingDeviceId(), deviceAPI); deviceAPI->setSampleMIMO(mimo); +} + +void MainWindow::sampleMIMOCreateUI( + int deviceSetIndex, + int deviceIndex, + DeviceUISet *deviceUISet +) +{ + DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; + int selectedDeviceIndex = deviceIndex; + const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(deviceIndex); QWidget *gui; DeviceGUI *deviceGUI = deviceAPI->getPluginInterface()->createSampleMIMOPluginInstanceGUI( deviceAPI->getSamplingDeviceId(), @@ -962,164 +1697,26 @@ void MainWindow::removeDeviceSet(int deviceSetIndex) return; } - DeviceUISet *deviceUISet = m_deviceUIs[deviceSetIndex]; - - if (deviceUISet->m_deviceSourceEngine) // source device - { - DSPDeviceSourceEngine *deviceEngine = deviceUISet->m_deviceSourceEngine; - deviceEngine->removeSink(deviceUISet->m_spectrumVis); - - // deletes old UI and core object - deviceUISet->freeChannels(); // destroys the channel instances - deviceUISet->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(nullptr); // have source stop sending messages to the GUI - delete deviceUISet->m_deviceGUI; - deviceUISet->m_deviceAPI->resetSamplingDeviceId(); - deviceUISet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - - - m_dspEngine->removeDeviceEngineAt(deviceSetIndex); - DeviceEnumerator::instance()->removeRxSelection(deviceSetIndex); - - DeviceAPI *sourceAPI = deviceUISet->m_deviceAPI; - delete deviceUISet; - delete sourceAPI->getSampleSource(); - delete sourceAPI; - } - else if (deviceUISet->m_deviceSinkEngine) // sink device - { - DSPDeviceSinkEngine *deviceEngine = deviceUISet->m_deviceSinkEngine; - deviceEngine->removeSpectrumSink(deviceUISet->m_spectrumVis); - - // deletes old UI and output object - deviceUISet->freeChannels(); - deviceUISet->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI - delete deviceUISet->m_deviceGUI; - deviceUISet->m_deviceAPI->resetSamplingDeviceId(); - deviceUISet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - - m_dspEngine->removeDeviceEngineAt(deviceSetIndex); - DeviceEnumerator::instance()->removeTxSelection(deviceSetIndex); - - DeviceAPI *sinkAPI = deviceUISet->m_deviceAPI; - delete deviceUISet; - delete sinkAPI->getSampleSink(); - delete sinkAPI; - } - else if (deviceUISet->m_deviceMIMOEngine) // MIMO device - { - DSPDeviceMIMOEngine *deviceEngine = deviceUISet->m_deviceMIMOEngine; - deviceEngine->removeSpectrumSink(deviceUISet->m_spectrumVis); - - // deletes old UI and output object - deviceUISet->freeChannels(); - deviceUISet->m_deviceAPI->getSampleMIMO()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI - delete deviceUISet->m_deviceGUI; - deviceUISet->m_deviceAPI->resetSamplingDeviceId(); - - - m_dspEngine->removeDeviceEngineAt(deviceSetIndex); - DeviceEnumerator::instance()->removeMIMOSelection(deviceSetIndex); - - DeviceAPI *mimoAPI = deviceUISet->m_deviceAPI; - delete deviceUISet; - delete mimoAPI->getSampleMIMO(); - delete mimoAPI; + RemoveDeviceSetFSM *fsm = new RemoveDeviceSetFSM(this, deviceSetIndex); + connect(fsm, &RemoveDeviceSetFSM::finished, fsm, &RemoveDeviceSetFSM::deleteLater); + fsm->start(); } - m_deviceUIs.erase(m_deviceUIs.begin() + deviceSetIndex); - m_mainCore->removeDeviceSet(deviceSetIndex); - DeviceEnumerator::instance()->renumeratetabIndex(deviceSetIndex); - - // Renumerate - for (int i = 0; i < (int) m_deviceUIs.size(); i++) +void MainWindow::removeAllDeviceSets() { - DeviceUISet *xDeviceUISet = m_deviceUIs[i]; - xDeviceUISet->setIndex(i); - const DeviceGUI *deviceGUI = m_deviceUIs[i]->m_deviceGUI; - Workspace *deviceWorkspace = m_workspaces[deviceGUI->getWorkspaceIndex()]; - - QObject::disconnect( - deviceGUI, - &DeviceGUI::addChannelEmitted, - this, - nullptr - ); - QObject::connect( - deviceGUI, - &DeviceGUI::addChannelEmitted, - this, - [this, deviceWorkspace, i](int channelPluginIndex){ this->channelAddClicked(deviceWorkspace, i, channelPluginIndex); } - ); + qDebug() << "MainWindow::removeAllDeviceSets"; + RemoveAllDeviceSetsFSM *fsm = new RemoveAllDeviceSetsFSM(this); + connect(fsm, &RemoveAllDeviceSetsFSM::finished, fsm, &RemoveAllDeviceSetsFSM::deleteLater); + fsm->start(); } - emit m_mainCore->deviceSetRemoved(deviceSetIndex); -} - void MainWindow::removeLastDeviceSet() { + if (m_deviceUIs.size() > 0) + { qDebug("MainWindow::removeLastDeviceSet: %s", qPrintable(m_deviceUIs.back()->m_deviceAPI->getHardwareId())); - auto removedDeviceSetIndex = (int) (m_deviceUIs.size() - 1); - - if (m_deviceUIs.back()->m_deviceSourceEngine) // source tab - { - DSPDeviceSourceEngine *lastDeviceEngine = m_deviceUIs.back()->m_deviceSourceEngine; - lastDeviceEngine->removeSink(m_deviceUIs.back()->m_spectrumVis); - - // deletes old UI and input object - m_deviceUIs.back()->freeChannels(); // destroys the channel instances - m_deviceUIs.back()->m_deviceAPI->getSampleSource()->setMessageQueueToGUI(nullptr); // have source stop sending messages to the GUI - delete m_deviceUIs.back()->m_deviceGUI; - m_deviceUIs.back()->m_deviceAPI->resetSamplingDeviceId(); - m_deviceUIs.back()->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - - m_dspEngine->removeLastDeviceSourceEngine(); - - DeviceAPI *sourceAPI = m_deviceUIs.back()->m_deviceAPI; - delete m_deviceUIs.back(); - delete sourceAPI->getSampleSource(); - delete sourceAPI; + removeDeviceSet(m_deviceUIs.size() - 1); } - else if (m_deviceUIs.back()->m_deviceSinkEngine) // sink tab - { - DSPDeviceSinkEngine *lastDeviceEngine = m_deviceUIs.back()->m_deviceSinkEngine; - lastDeviceEngine->removeSpectrumSink(m_deviceUIs.back()->m_spectrumVis); - - // deletes old UI and output object - m_deviceUIs.back()->freeChannels(); - m_deviceUIs.back()->m_deviceAPI->getSampleSink()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI - delete m_deviceUIs.back()->m_deviceGUI; - m_deviceUIs.back()->m_deviceAPI->resetSamplingDeviceId(); - m_deviceUIs.back()->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists - - m_dspEngine->removeLastDeviceSinkEngine(); - - DeviceAPI *sinkAPI = m_deviceUIs.back()->m_deviceAPI; - delete m_deviceUIs.back(); - delete sinkAPI->getSampleSink(); - delete sinkAPI; - } - else if (m_deviceUIs.back()->m_deviceMIMOEngine) // MIMO tab - { - DSPDeviceMIMOEngine *lastDeviceEngine = m_deviceUIs.back()->m_deviceMIMOEngine; - lastDeviceEngine->removeSpectrumSink(m_deviceUIs.back()->m_spectrumVis); - - // deletes old UI and output object - m_deviceUIs.back()->freeChannels(); - m_deviceUIs.back()->m_deviceAPI->getSampleMIMO()->setMessageQueueToGUI(nullptr); // have sink stop sending messages to the GUI - delete m_deviceUIs.back()->m_deviceGUI; - m_deviceUIs.back()->m_deviceAPI->resetSamplingDeviceId(); - - m_dspEngine->removeLastDeviceMIMOEngine(); - - DeviceAPI *mimoAPI = m_deviceUIs.back()->m_deviceAPI; - delete m_deviceUIs.back(); - delete mimoAPI->getSampleMIMO(); - delete mimoAPI; - } - - m_deviceUIs.pop_back(); - m_mainCore->removeLastDeviceSet(); - emit m_mainCore->deviceSetRemoved(removedDeviceSetIndex); } void MainWindow::addFeatureSet() @@ -1308,181 +1905,10 @@ void MainWindow::loadConfiguration(const Configuration *configuration, bool from QApplication::processEvents(); } - // Wipe out everything first - if (waitBox) - { - waitBox->setLabelText("Deleting existing..."); - waitBox->setValue(5); - QApplication::processEvents(); - } - // Device sets - while (!m_deviceUIs.empty()) { - removeLastDeviceSet(); - } - // Features - m_featureUIs[0]->freeFeatures(); - // Workspaces - for (const auto& workspace : m_workspaces) { - delete workspace; - } - m_workspaces.clear(); - - // Reconstruct - - // Workspaces - for (int i = 0; i < configuration->getNumberOfWorkspaceGeometries(); i++) - { - addWorkspace(); - m_workspaces[i]->setAutoStackOption(configuration->getWorkspaceAutoStackOptions()[i]); - m_workspaces[i]->setTabSubWindowsOption(configuration->getWorkspaceTabSubWindowsOptions()[i]); - } - - if (m_workspaces.size() <= 0) { // cannot go further if there are no workspaces - return; - } - - // Device sets - if (waitBox) - { - waitBox->setLabelText("Loading device sets..."); - waitBox->setValue(25); - QApplication::processEvents(); - } - - const QList& deviceSetPresets = configuration->getDeviceSetPresets(); - - for (const auto& deviceSetPreset : deviceSetPresets) - { - if (deviceSetPreset.isSourcePreset()) - { - int bestDeviceIndex = DeviceEnumerator::instance()->getBestRxSamplingDeviceIndex( - deviceSetPreset.getSelectedDevice().m_deviceId, - deviceSetPreset.getSelectedDevice().m_deviceSerial, - deviceSetPreset.getSelectedDevice().m_deviceSequence, - deviceSetPreset.getSelectedDevice().m_deviceItemIndex - ); - qDebug("MainWindow::loadConfiguration: add source %s in workspace %d spectrum in %d", - qPrintable(deviceSetPreset.getSelectedDevice().m_deviceId), - deviceSetPreset.getDeviceWorkspaceIndex(), - deviceSetPreset.getSpectrumWorkspaceIndex()); - int deviceWorkspaceIndex = deviceSetPreset.getDeviceWorkspaceIndex() < m_workspaces.size() ? - deviceSetPreset.getDeviceWorkspaceIndex() : - 0; - int spectrumWorkspaceIndex = deviceSetPreset.getSpectrumWorkspaceIndex() < m_workspaces.size() ? - deviceSetPreset.getSpectrumWorkspaceIndex() : - deviceWorkspaceIndex; - sampleSourceAdd(m_workspaces[deviceWorkspaceIndex], m_workspaces[spectrumWorkspaceIndex], bestDeviceIndex); - } - else if (deviceSetPreset.isSinkPreset()) - { - int bestDeviceIndex = DeviceEnumerator::instance()->getBestTxSamplingDeviceIndex( - deviceSetPreset.getSelectedDevice().m_deviceId, - deviceSetPreset.getSelectedDevice().m_deviceSerial, - deviceSetPreset.getSelectedDevice().m_deviceSequence, - deviceSetPreset.getSelectedDevice().m_deviceItemIndex - ); - qDebug("MainWindow::loadConfiguration: add sink %s in workspace %d spectrum in %d", - qPrintable(deviceSetPreset.getSelectedDevice().m_deviceId), - deviceSetPreset.getDeviceWorkspaceIndex(), - deviceSetPreset.getSpectrumWorkspaceIndex()); - int deviceWorkspaceIndex = deviceSetPreset.getDeviceWorkspaceIndex() < m_workspaces.size() ? - deviceSetPreset.getDeviceWorkspaceIndex() : - 0; - int spectrumWorkspaceIndex = deviceSetPreset.getSpectrumWorkspaceIndex() < m_workspaces.size() ? - deviceSetPreset.getSpectrumWorkspaceIndex() : - deviceWorkspaceIndex; - sampleSinkAdd(m_workspaces[deviceWorkspaceIndex], m_workspaces[spectrumWorkspaceIndex], bestDeviceIndex); - } - else if (deviceSetPreset.isMIMOPreset()) - { - int bestDeviceIndex = DeviceEnumerator::instance()->getBestMIMOSamplingDeviceIndex( - deviceSetPreset.getSelectedDevice().m_deviceId, - deviceSetPreset.getSelectedDevice().m_deviceSerial, - deviceSetPreset.getSelectedDevice().m_deviceSequence - ); - qDebug("MainWindow::loadConfiguration: add MIMO %s in workspace %d spectrum in %d", - qPrintable(deviceSetPreset.getSelectedDevice().m_deviceId), - deviceSetPreset.getDeviceWorkspaceIndex(), - deviceSetPreset.getSpectrumWorkspaceIndex()); - int deviceWorkspaceIndex = deviceSetPreset.getDeviceWorkspaceIndex() < m_workspaces.size() ? - deviceSetPreset.getDeviceWorkspaceIndex() : - 0; - int spectrumWorkspaceIndex = deviceSetPreset.getSpectrumWorkspaceIndex() < m_workspaces.size() ? - deviceSetPreset.getSpectrumWorkspaceIndex() : - deviceWorkspaceIndex; - sampleMIMOAdd(m_workspaces[deviceWorkspaceIndex], m_workspaces[spectrumWorkspaceIndex], bestDeviceIndex); - } - else - { - qDebug() << "MainWindow::loadConfiguration: Unknown preset type: " << deviceSetPreset.getPresetType(); - } - - if (!m_deviceUIs.empty()) - { - MDIUtils::restoreMDIGeometry(m_deviceUIs.back()->m_deviceGUI, deviceSetPreset.getDeviceGeometry()); - MDIUtils::restoreMDIGeometry(m_deviceUIs.back()->m_mainSpectrumGUI, deviceSetPreset.getSpectrumGeometry()); - m_deviceUIs.back()->loadDeviceSetSettings(&deviceSetPreset, m_pluginManager->getPluginAPI(), &m_workspaces, nullptr); - } - - if (waitBox) - { - waitBox->setValue(waitBox->value() + 50/deviceSetPresets.size()); - QApplication::processEvents(); - } - } - - // Features - if (waitBox) - { - waitBox->setLabelText("Loading feature sets..."); - waitBox->setValue(75); - QApplication::processEvents(); - } - - m_featureUIs[0]->loadFeatureSetSettings( - &configuration->getFeatureSetPreset(), - m_pluginManager->getPluginAPI(), - m_apiAdapter, - &m_workspaces, - nullptr - ); - - for (int i = 0; i < m_featureUIs[0]->getNumberOfFeatures(); i++) - { - FeatureGUI *gui = m_featureUIs[0]->getFeatureGuiAt(i); - QObject::connect( - gui, - &FeatureGUI::moveToWorkspace, - this, - [this, gui](int wsIndexDest){ this->featureMove(gui, wsIndexDest); } - ); - } - - // Lastly restore workspaces geometry - if (waitBox) - { - waitBox->setValue(90); - waitBox->setLabelText("Finalizing..."); - QApplication::processEvents(); - } - - for (int i = 0; i < configuration->getNumberOfWorkspaceGeometries(); i++) - { - m_workspaces[i]->restoreGeometry(configuration->getWorkspaceGeometries()[i]); - m_workspaces[i]->restoreGeometry(configuration->getWorkspaceGeometries()[i]); - m_workspaces[i]->adjustSubWindowsAfterRestore(); -#ifdef ANDROID - // On Android, workspaces seem to be restored to 0,20, rather than 0,0 - m_workspaces[i]->move(m_workspaces[i]->pos().x(), 0); - // Need to call updateGeometry, otherwise sometimes the layout is corrupted - m_workspaces[i]->updateGeometry(); -#endif - } - - if (waitBox) { - waitBox->setValue(100); + LoadConfigurationFSM *fsm = new LoadConfigurationFSM(this, configuration, waitBox); + connect(fsm, &LoadConfigurationFSM::finished, fsm, &LoadConfigurationFSM::deleteLater); + fsm->start(); } -} void MainWindow::saveConfiguration(Configuration *configuration) { @@ -1630,20 +2056,29 @@ void MainWindow::createMenuBar(QToolButton *button) const QAction *fftAction = preferencesMenu->addAction("&FFT..."); fftAction->setToolTip("Set FFT preferences"); QObject::connect(fftAction, &QAction::triggered, this, &MainWindow::on_action_FFT_triggered); +#if QT_CONFIG(process) QAction *fftWisdomAction = preferencesMenu->addAction("&FFTW Wisdom..."); fftWisdomAction->setToolTip("Set FFTW cache"); QObject::connect(fftWisdomAction, &QAction::triggered, this, &MainWindow::on_action_FFTWisdom_triggered); +#endif QMenu *devicesMenu = preferencesMenu->addMenu("&Devices"); QAction *userArgumentsAction = devicesMenu->addAction("&User arguments..."); userArgumentsAction->setToolTip("Device custom user arguments"); QObject::connect(userArgumentsAction, &QAction::triggered, this, &MainWindow::on_action_DeviceUserArguments_triggered); +#if QT_CONFIG(process) QAction *commandsAction = preferencesMenu->addAction("C&ommands..."); commandsAction->setToolTip("External commands dialog"); QObject::connect(commandsAction, &QAction::triggered, this, &MainWindow::on_action_commands_triggered); +#endif QAction *saveAllAction = preferencesMenu->addAction("&Save all"); saveAllAction->setToolTip("Save all current settings"); QObject::connect(saveAllAction, &QAction::triggered, this, &MainWindow::on_action_saveAll_triggered); +#if defined(ANDROID) || defined(__EMSCRIPTEN__) + QAction *welcomeAction = helpMenu->addAction("&Welcome..."); + welcomeAction->setToolTip("Show welcome dialog"); + QObject::connect(welcomeAction, &QAction::triggered, this, &MainWindow::on_action_Welcome_triggered); +#endif QAction *quickStartAction = helpMenu->addAction("&Quick start..."); quickStartAction->setToolTip("Instructions for quick start"); QObject::connect(quickStartAction, &QAction::triggered, this, &MainWindow::on_action_Quick_Start_triggered); @@ -1679,6 +2114,8 @@ void MainWindow::closeEvent(QCloseEvent *closeEvent) { qDebug("MainWindow::closeEvent"); + if (!m_settingsSaved) + { // Save window size and position QSettings s; s.setValue("mainWindowGeometry", qCompress(saveGeometry()).toBase64()); @@ -1687,8 +2124,16 @@ void MainWindow::closeEvent(QCloseEvent *closeEvent) saveConfiguration(m_mainCore->m_settings.getWorkingConfiguration()); m_mainCore->m_settings.save(); - while (!m_deviceUIs.empty()) { - removeLastDeviceSet(); + m_settingsSaved = true; + } + + if (m_deviceUIs.size() > 0) + { + CloseFSM *fsm = new CloseFSM(this); + connect(fsm, &CloseFSM::finished, fsm, &CloseFSM::deleteLater); + fsm->start(); + closeEvent->ignore(); // CloseFSM will call close again later once all devices closed + return; } if (m_profileDialog) { @@ -2186,6 +2631,14 @@ void MainWindow::on_action_saveAll_triggered() QMessageBox::information(this, tr("Done"), tr("All current settings saved")); } +void MainWindow::on_action_Welcome_triggered() +{ + // Show welcome dialog + WelcomeDialog welcomeDialog(this); + new DialogPositioner(&welcomeDialog, true); + welcomeDialog.exec(); +} + void MainWindow::on_action_Quick_Start_triggered() const { QDesktopServices::openUrl(QUrl("https://github.com/f4exb/sdrangel/wiki/Quick-start")); @@ -2265,6 +2718,7 @@ void MainWindow::on_action_DeviceUserArguments_triggered() deviceUserArgsDialog.exec(); } +#if QT_CONFIG(process) void MainWindow::on_action_commands_triggered() { qDebug("MainWindow::on_action_commands_triggered"); @@ -2276,6 +2730,7 @@ void MainWindow::on_action_commands_triggered() new DialogPositioner(&commandsDialog, true); commandsDialog.exec(); } +#endif void MainWindow::on_action_FFT_triggered() { @@ -2285,6 +2740,7 @@ void MainWindow::on_action_FFT_triggered() fftDialog.exec(); } +#if QT_CONFIG(process) void MainWindow::on_action_FFTWisdom_triggered() { qDebug("MainWindow::on_action_FFTWisdom_triggered"); @@ -2379,6 +2835,7 @@ void MainWindow::sampleSourceChange(int deviceSetIndex, int newDeviceIndex, Work deviceUISet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists sampleSourceCreate(deviceSetIndex, newDeviceIndex, deviceUISet); + sampleSourceCreateUI(deviceSetIndex, newDeviceIndex, deviceUISet); deviceUISet->m_deviceGUI->setWorkspaceIndex(workspace->getIndex()); workspace->addToMdiArea(deviceUISet->m_deviceGUI); deviceUISet->m_deviceGUI->move(p); @@ -2411,6 +2868,7 @@ void MainWindow::sampleSinkChange(int deviceSetIndex, int newDeviceIndex, Worksp deviceUISet->m_deviceAPI->clearBuddiesLists(); // clear old API buddies lists sampleSinkCreate(deviceSetIndex, newDeviceIndex, deviceUISet); + sampleSinkCreateUI(deviceSetIndex, newDeviceIndex, deviceUISet); deviceUISet->m_deviceGUI->setWorkspaceIndex(workspace->getIndex()); workspace->addToMdiArea(deviceUISet->m_deviceGUI); deviceUISet->m_deviceGUI->move(p); @@ -2442,6 +2900,7 @@ void MainWindow::sampleMIMOChange(int deviceSetIndex, int newDeviceIndex, Worksp deviceUISet->m_deviceAPI->getPluginInterface()->deleteSampleMIMOPluginInstanceMIMO(deviceUISet->m_deviceAPI->getSampleMIMO()); sampleMIMOCreate(deviceSetIndex, newDeviceIndex, deviceUISet); + sampleMIMOCreateUI(deviceSetIndex, newDeviceIndex, deviceUISet); deviceUISet->m_deviceGUI->setWorkspaceIndex(workspace->getIndex()); workspace->addToMdiArea(deviceUISet->m_deviceGUI); deviceUISet->m_deviceGUI->move(p); diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index d8e144d81a..ae6803ddca 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -27,6 +27,11 @@ #include #include #include +#include +#include +#include +#include +#include #include "settings/mainsettings.h" #include "util/message.h" @@ -43,6 +48,7 @@ class QToolButton; class DSPEngine; class DSPDeviceSourceEngine; class DSPDeviceSinkEngine; +class DSPDeviceMIMOEngine; class Indicator; class GLSpectrumGUI; class MainSpectrumGUI; @@ -65,13 +71,217 @@ class CommandKeyReceiver; class ConfigurationsDialog; class ProfileDialog; class SerializableInterface; +class SDRangelSplash; class QMenuBar; class Workspace; +class MainWindow; + +// Would preferablly have these FSM classes as nested classes of MainWindow +// However, as they inherit from QObject, they should have Q_OBJECT macro which isn't supported for nested classes +// Instead we have to declare them as friend classes to MainWindow + +class MainWindowFSM : public QStateMachine { + Q_OBJECT + +public: + + MainWindowFSM(MainWindow *mainWindow, QObject *parent=nullptr); + +protected: + + void createStates(int states); // number of states to create, including final state + + MainWindow *m_mainWindow; + QList m_states; + QFinalState *m_finalState; + +}; + +class AddSampleSourceFSM : public MainWindowFSM { + Q_OBJECT + +public: + + AddSampleSourceFSM(MainWindow *mainWindow, Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex, bool loadDefaults, QObject *parent=nullptr); + +private: + + Workspace *m_deviceWorkspace; + Workspace *m_spectrumWorkspace; + int m_deviceIndex; + bool m_loadDefaults; + + int m_deviceSetIndex; + DeviceAPI *m_deviceAPI; + DeviceUISet *m_deviceUISet; + + DSPDeviceSourceEngine *m_dspDeviceSourceEngine; + + void addEngine(); + void addDevice(); + void addDeviceUI(); +}; + +class AddSampleSinkFSM : public MainWindowFSM { + Q_OBJECT + +public: + + AddSampleSinkFSM(MainWindow *mainWindow, Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex, bool loadDefaults, QObject *parent=nullptr); + +private: + + Workspace *m_deviceWorkspace; + Workspace *m_spectrumWorkspace; + int m_deviceIndex; + bool m_loadDefaults; + + int m_deviceSetIndex; + DeviceAPI *m_deviceAPI; + DeviceUISet *m_deviceUISet; + + DSPDeviceSinkEngine *m_dspDeviceSinkEngine; + + void addEngine(); + void addDevice(); + void addDeviceUI(); +}; + +class AddSampleMIMOFSM : public MainWindowFSM { + Q_OBJECT + +public: + + AddSampleMIMOFSM(MainWindow *mainWindow, Workspace *deviceWorkspace, Workspace *spectrumWorkspace, int deviceIndex, bool loadDefaults, QObject *parent=nullptr); + +private: + + Workspace *m_deviceWorkspace; + Workspace *m_spectrumWorkspace; + int m_deviceIndex; + bool m_loadDefaults; + + int m_deviceSetIndex; + DeviceAPI *m_deviceAPI; + DeviceUISet *m_deviceUISet; + + DSPDeviceMIMOEngine *m_dspDeviceMIMOEngine; + + void addEngine(); + void addDevice(); + void addDeviceUI(); +}; + +class RemoveDeviceSetFSM : public MainWindowFSM { + Q_OBJECT + +public: + RemoveDeviceSetFSM(MainWindow *mainWindow, int deviceSetIndex, QObject *parent=nullptr); + +private: + int m_deviceSetIndex; + DeviceUISet *m_deviceUISet; + DSPDeviceSourceEngine *m_deviceSourceEngine; + DSPDeviceSinkEngine *m_deviceSinkEngine; + DSPDeviceMIMOEngine *m_deviceMIMOEngine; + QSignalTransition *m_t1; + QSignalTransition *m_t2; + + void stopAcquisition(); + void removeSink(); + void removeUI(); + void stopEngine(); + void removeDeviceSet(); +}; + +class RemoveAllDeviceSetsFSM : public MainWindowFSM { + Q_OBJECT + +public: + RemoveAllDeviceSetsFSM(MainWindow *mainWindow, QObject *parent=nullptr); + +private: + + void removeNext(); + +}; + +class RemoveAllWorkspacesFSM : public MainWindowFSM { + Q_OBJECT + +public: + RemoveAllWorkspacesFSM(MainWindow *mainWindow, QObject *parent=nullptr); + +private: + + RemoveAllDeviceSetsFSM *m_removeAllDeviceSetsFSM; + + void removeDeviceSets(); + void removeWorkspaces(); + +}; + +class LoadConfigurationFSM : public MainWindowFSM { + Q_OBJECT + +public: + LoadConfigurationFSM(MainWindow *mainWindow, const Configuration *configuration, QProgressDialog *waitBox, QObject *parent=nullptr); + +private: + + const Configuration *m_configuration; + QProgressDialog *m_waitBox; + + RemoveAllWorkspacesFSM *m_removeAllWorkspacesFSM; + + void clearWorkspace(); + void createWorkspaces(); + void loadDeviceSets(); + void loadDeviceSetSettings(); + void loadFeatureSets(); + void restoreGeometry(); +}; + +class CloseFSM : public MainWindowFSM { + Q_OBJECT + +public: + CloseFSM(MainWindow *mainWindow, QObject *parent=nullptr); + +private: + void on_started(); + void on_finished(); +}; + +class InitFSM : public MainWindowFSM { + Q_OBJECT + +public: + InitFSM(MainWindow *mainWindow, SDRangelSplash *splash, bool loadDefault, QObject *parent=nullptr); + +private: + SDRangelSplash *m_splash; + LoadConfigurationFSM *m_loadConfigurationFSM; + + void loadDefaultConfiguration(); + void showDefaultConfigurations(); +}; + class SDRGUI_API MainWindow : public QMainWindow { Q_OBJECT + friend InitFSM; + friend AddSampleSourceFSM; + friend AddSampleSinkFSM; + friend AddSampleMIMOFSM; + friend LoadConfigurationFSM; + friend RemoveDeviceSetFSM; + friend RemoveAllDeviceSetsFSM; + friend RemoveAllWorkspacesFSM; + friend CloseFSM; + public: explicit MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parser, QWidget* parent = nullptr); ~MainWindow() final; @@ -130,7 +340,11 @@ public slots: CommandKeyReceiver *m_commandKeyReceiver; ProfileDialog *m_profileDialog; +#if QT_CONFIG(process) QProcess *m_fftWisdomProcess; +#endif + + bool m_settingsSaved; // Records if settings have already been saved in response to a QCloseEvent void loadSettings(); void loadDeviceSetPresetSettings(const Preset* preset, int deviceSetIndex); @@ -146,6 +360,7 @@ public slots: void removeDeviceSet(int deviceSetIndex); void removeLastDeviceSet(); + void removeAllDeviceSets(); void addFeatureSet(); void removeFeatureSet(unsigned int featureSetIndex); void removeAllFeatureSets(); @@ -160,15 +375,30 @@ public slots: int deviceIndex, DeviceUISet *deviceUISet ); + void sampleSourceCreateUI( + int deviceSetIndex, + int deviceIndex, + DeviceUISet *deviceUISet + ); void sampleSinkCreate( int deviceSetIndex, int deviceIndex, DeviceUISet *deviceUISet ); + void sampleSinkCreateUI( + int deviceSetIndex, + int deviceIndex, + DeviceUISet *deviceUISet + ); void sampleMIMOCreate( int deviceSetIndex, int deviceIndex, DeviceUISet *deviceUISet + ); + void sampleMIMOCreateUI( + int deviceSetIndex, + int deviceIndex, + DeviceUISet *deviceUISet ); void deleteFeature(int featureSetIndex, int featureIndex); void loadDefaultPreset(const QString& pluginId, SerializableInterface *serializableInterface); @@ -178,6 +408,12 @@ public slots: protected: void keyPressEvent(QKeyEvent* event) override; +signals: + // For internal FSM usage + void allDeviceSetsRemoved(); + void allDeviceSetsAdded(); + void engineStopped(); + private slots: void handleMessages(); void handleWorkspaceVisibility(Workspace *workspace, bool visibility); @@ -193,10 +429,13 @@ private slots: void on_action_Graphics_triggered(); void on_action_Logging_triggered(); void on_action_FFT_triggered(); +#if QT_CONFIG(process) void on_action_FFTWisdom_triggered(); + void on_action_commands_triggered(); +#endif void on_action_My_Position_triggered(); void on_action_DeviceUserArguments_triggered(); - void on_action_commands_triggered(); + void on_action_Welcome_triggered(); void on_action_Quick_Start_triggered() const; void on_action_Main_Window_triggered() const; void on_action_Loaded_Plugins_triggered(); @@ -228,7 +467,9 @@ private slots: void showAllChannels(int deviceSetIndex); void openDeviceSetPresetsDialog(QPoint p, const DeviceGUI *deviceGUI); void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release) const; +#if QT_CONFIG(process) void fftWisdomProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); +#endif void orientationChanged(Qt::ScreenOrientation orientation); }; From 3df1ce20aeaa0b565b7ffa5154c2fcc488f2e06b Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 14:36:06 +0100 Subject: [PATCH 2/7] Fix warnings, --- sdrgui/gui/workspace.h | 3 ++- sdrgui/mainwindow.cpp | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sdrgui/gui/workspace.h b/sdrgui/gui/workspace.h index 97ee0fd316..d015718328 100644 --- a/sdrgui/gui/workspace.h +++ b/sdrgui/gui/workspace.h @@ -119,12 +119,13 @@ private slots: void stackSubWindows(); void autoStackSubWindows(const QPoint&); void tabSubWindows(); - void layoutSubWindows(); void startStopClicked(bool checked = false); void addFeatureEmitted(int featureIndex); void toggleFloating(); void deviceStateChanged(int, DeviceAPI *deviceAPI); void subWindowActivated(QMdiSubWindow *window); +public slots: + void layoutSubWindows(); signals: void addRxDevice(Workspace *inWorkspace, int deviceIndex); diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 450b010c9f..8043605fbd 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -137,12 +137,6 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse #endif m_settingsSaved(false) { -#if defined(ANDROID) || defined(__EMSCRIPTEN__) - bool showWelcome = true; -#else - bool showWelcome = false; -#endif - QAccessible::installFactory(AccessibleValueDial::factory); QAccessible::installFactory(AccessibleValueDialZ::factory); @@ -898,7 +892,7 @@ void RemoveAllWorkspacesFSM::removeWorkspaces() } LoadConfigurationFSM::LoadConfigurationFSM(MainWindow *mainWindow, const Configuration *configuration, QProgressDialog *waitBox, QObject *parent) : - MainWindowFSM(mainWindow), + MainWindowFSM(mainWindow, parent), m_configuration(configuration), m_waitBox(waitBox) { @@ -1091,7 +1085,7 @@ void LoadConfigurationFSM::loadDeviceSetSettings() int deviceSetIndex = 0; for (const auto& deviceSetPreset : deviceSetPresets) { - if (m_mainWindow->m_deviceUIs.size() > deviceSetIndex) + if (((int) m_mainWindow->m_deviceUIs.size()) > deviceSetIndex) { MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_deviceGUI, deviceSetPreset.getDeviceGeometry()); MDIUtils::restoreMDIGeometry(m_mainWindow->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI, deviceSetPreset.getSpectrumGeometry()); @@ -1170,11 +1164,18 @@ InitFSM::InitFSM(MainWindow *mainWindow, SDRangelSplash *splash, bool loadDefaul // Create FSM createStates(2); + if (loadDefault) + { m_loadConfigurationFSM = new LoadConfigurationFSM(m_mainWindow, m_mainWindow->m_mainCore->getMutableSettings().getWorkingConfiguration(), nullptr, this); m_states[0]->addTransition(m_loadConfigurationFSM, &LoadConfigurationFSM::finished, m_finalState); connect(m_states[0], &QState::entered, this, &InitFSM::loadDefaultConfiguration); + } + else + { + m_states[0]->addTransition(m_finalState); + } connect(m_finalState, &QState::entered, this, &InitFSM::showDefaultConfigurations); } @@ -2792,6 +2793,7 @@ void MainWindow::fftWisdomProcessFinished(int exitCode, QProcess::ExitStatus exi delete m_fftWisdomProcess; m_fftWisdomProcess = nullptr; } +#endif void MainWindow::samplingDeviceChangeHandler(const DeviceGUI *deviceGUI, int newDeviceIndex) { From 5ac208119584697543e6f04ec384b2d4bc60a7f9 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 15:03:24 +0100 Subject: [PATCH 3/7] DeviceGUI::closeEvent - Don't automatically delete the GUI, as MainWindow::RemoveDeviceSetFSM::removeUI will do it --- sdrgui/device/devicegui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdrgui/device/devicegui.cpp b/sdrgui/device/devicegui.cpp index a804812fb5..1453ce872f 100644 --- a/sdrgui/device/devicegui.cpp +++ b/sdrgui/device/devicegui.cpp @@ -283,7 +283,7 @@ void DeviceGUI::closeEvent(QCloseEvent *event) { qDebug("DeviceGUI::closeEvent"); emit closing(); - event->accept(); + event->ignore(); // Don't automatically delete this object - MainWindow::RemoveDeviceSetFSM::removeUI will do it } void DeviceGUI::mousePressEvent(QMouseEvent* event) From a04f84fcc304802a78c58df96978d80485a53d34 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 15:11:23 +0100 Subject: [PATCH 4/7] Adds comment --- sdrgui/device/devicegui.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdrgui/device/devicegui.cpp b/sdrgui/device/devicegui.cpp index 1453ce872f..e392403989 100644 --- a/sdrgui/device/devicegui.cpp +++ b/sdrgui/device/devicegui.cpp @@ -44,7 +44,8 @@ DeviceGUI::DeviceGUI(QWidget *parent) : m_contextMenuType(ContextMenuNone), m_resizer(this), m_drag(false), - m_currentDeviceIndex(-1) + m_currentDeviceIndex(-1), + m_channelAddDialog(this) { qDebug("DeviceGUI::DeviceGUI: %p", parent); setWindowFlags(windowFlags() | Qt::FramelessWindowHint); @@ -283,7 +284,7 @@ void DeviceGUI::closeEvent(QCloseEvent *event) { qDebug("DeviceGUI::closeEvent"); emit closing(); - event->ignore(); // Don't automatically delete this object - MainWindow::RemoveDeviceSetFSM::removeUI will do it + event->ignore(); // Don't automatically delete the GUI - MainWindow::RemoveDeviceSetFSM::removeUI will do it } void DeviceGUI::mousePressEvent(QMouseEvent* event) @@ -380,7 +381,8 @@ void DeviceGUI::openMoveToWorkspaceDialog() void DeviceGUI::openAddChannelsDialog() { - m_channelAddDialog.exec(); + //m_channelAddDialog.exec(); + m_channelAddDialog.open(); } void DeviceGUI::showSpectrumHandler() From 41f2b0457a9d6e854d6082a9b3eb6dee70551549 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 15:21:53 +0100 Subject: [PATCH 5/7] Cleanup --- sdrgui/mainwindow.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 8043605fbd..e00ea0916d 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -795,8 +795,6 @@ void RemoveDeviceSetFSM::removeDeviceSet() DeviceAPI *deviceAPI = m_deviceUISet->m_deviceAPI; delete m_deviceUISet; - // FIXME: DSPEngine::addDeviceSourceEngine() used to setup deleteLater for these objects - // But that would cause crash on exit if (m_deviceSourceEngine) { delete deviceAPI->getSampleSource(); } else if (m_deviceSinkEngine) { @@ -946,11 +944,7 @@ void LoadConfigurationFSM::createWorkspaces() m_mainWindow->m_workspaces[i]->setAutoStackOption(m_configuration->getWorkspaceAutoStackOptions()[i]); m_mainWindow->m_workspaces[i]->setTabSubWindowsOption(m_configuration->getWorkspaceTabSubWindowsOptions()[i]); } - - if (m_mainWindow->m_workspaces.size() <= 0) { // cannot go further if there are no workspaces - // FIXME: How to terminate FSM?? Need extra transition to final } -} void LoadConfigurationFSM::loadDeviceSets() { From d5dc84883064bc9165fcee941f6967c1623b51d4 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 15:56:27 +0100 Subject: [PATCH 6/7] Don't load defaults if loading a preset --- sdrgui/mainwindow.cpp | 40 +++++++++++++++++++++------------------- sdrgui/mainwindow.h | 6 +++--- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index e00ea0916d..16f01a870b 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -429,7 +429,9 @@ void AddSampleSourceFSM::addDeviceUI() m_deviceWorkspace->addToMdiArea(m_deviceUISet->m_deviceGUI); m_spectrumWorkspace->addToMdiArea(m_deviceUISet->m_mainSpectrumGUI); + if (m_loadDefaults) { m_mainWindow->loadDefaultPreset(m_deviceAPI->getSamplingDeviceId(), m_deviceUISet); + } emit m_mainWindow->m_mainCore->deviceSetAdded(m_deviceSetIndex, m_deviceAPI); #ifdef ANDROID @@ -542,7 +544,9 @@ void AddSampleSinkFSM::addDeviceUI() m_deviceWorkspace->addToMdiArea(m_deviceUISet->m_deviceGUI); m_spectrumWorkspace->addToMdiArea(m_deviceUISet->m_mainSpectrumGUI); + if (m_loadDefaults) { m_mainWindow->loadDefaultPreset(m_deviceAPI->getSamplingDeviceId(), m_deviceUISet); + } emit m_mainWindow->m_mainCore->deviceSetAdded(m_deviceSetIndex, m_deviceAPI); #ifdef ANDROID @@ -655,7 +659,9 @@ void AddSampleMIMOFSM::addDeviceUI() m_deviceWorkspace->addToMdiArea(m_deviceUISet->m_deviceGUI); m_spectrumWorkspace->addToMdiArea(m_deviceUISet->m_mainSpectrumGUI); + if (m_loadDefaults) { m_mainWindow->loadDefaultPreset(m_deviceAPI->getSamplingDeviceId(), m_deviceUISet); + } emit m_mainWindow->m_mainCore->deviceSetAdded(m_deviceSetIndex, m_deviceAPI); #ifdef ANDROID @@ -1234,12 +1240,11 @@ void MainWindow::sampleSourceAdd(Workspace *deviceWorkspace, Workspace *spectrum void MainWindow::sampleSourceCreate( int deviceSetIndex, - int deviceIndex, + int& deviceIndex, DeviceUISet *deviceUISet ) { DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; - int selectedDeviceIndex = deviceIndex; DeviceEnumerator::instance()->changeRxSelection(deviceSetIndex, deviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); @@ -1264,7 +1269,7 @@ void MainWindow::sampleSourceCreate( { qDebug("MainWindow::sampleSourceCreate: non existent device replaced by File Input"); int fileInputDeviceIndex = DeviceEnumerator::instance()->getFileInputDeviceIndex(); - selectedDeviceIndex = fileInputDeviceIndex; + deviceIndex = fileInputDeviceIndex; samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(fileInputDeviceIndex); deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); @@ -1314,8 +1319,6 @@ void MainWindow::sampleSourceCreateUI( ) { DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; - int selectedDeviceIndex = deviceIndex; - const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); QWidget *gui; DeviceGUI *deviceGUI = deviceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( deviceAPI->getSamplingDeviceId(), @@ -1361,7 +1364,8 @@ void MainWindow::sampleSourceCreateUI( deviceAPI->getSampleSource()->setMessageQueueToGUI(deviceGUI->getInputMessageQueue()); deviceUISet->m_deviceGUI = deviceGUI; - const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex); + const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); + const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); // FIXME: Why not use samplingDevice? deviceUISet->m_selectedDeviceId = selectedDevice->id; deviceUISet->m_selectedDeviceSerial = selectedDevice->serial; deviceUISet->m_selectedDeviceSequence = selectedDevice->sequence; @@ -1372,7 +1376,7 @@ void MainWindow::sampleSourceCreateUI( deviceGUI->setIndex(deviceSetIndex); deviceGUI->setToolTip(samplingDevice->displayedName); deviceGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); - deviceGUI->setCurrentDeviceIndex(selectedDeviceIndex); + deviceGUI->setCurrentDeviceIndex(deviceIndex); QStringList channelNames; m_pluginManager->listRxChannels(channelNames); deviceGUI->setChannelNames(channelNames); @@ -1392,7 +1396,7 @@ void MainWindow::sampleSinkAdd(Workspace *deviceWorkspace, Workspace *spectrumWo void MainWindow::sampleSinkCreate( int deviceSetIndex, - int deviceIndex, + int& deviceIndex, DeviceUISet *deviceUISet ) { @@ -1422,7 +1426,7 @@ void MainWindow::sampleSinkCreate( { qDebug("MainWindow::sampleSinkCreate: non existent device replaced by File Sink"); int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex(); - selectedDeviceIndex = fileSinkDeviceIndex; + deviceIndex = fileSinkDeviceIndex; samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); @@ -1472,8 +1476,6 @@ void MainWindow::sampleSinkCreateUI( ) { DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; - int selectedDeviceIndex = deviceIndex; - const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceIndex); QWidget *gui; DeviceGUI *deviceGUI = deviceAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI( deviceAPI->getSamplingDeviceId(), @@ -1519,7 +1521,8 @@ void MainWindow::sampleSinkCreateUI( deviceAPI->getSampleSink()->setMessageQueueToGUI(deviceGUI->getInputMessageQueue()); deviceUISet->m_deviceGUI = deviceGUI; - const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex); + const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceIndex); + const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); // FIXME: Why getRxSamplingDevice? deviceUISet->m_selectedDeviceId = selectedDevice->id; deviceUISet->m_selectedDeviceSerial = selectedDevice->serial; deviceUISet->m_selectedDeviceSequence = selectedDevice->sequence; @@ -1530,7 +1533,7 @@ void MainWindow::sampleSinkCreateUI( deviceGUI->setIndex(deviceSetIndex); deviceGUI->setToolTip(samplingDevice->displayedName); deviceGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); - deviceGUI->setCurrentDeviceIndex(selectedDeviceIndex); + deviceGUI->setCurrentDeviceIndex(deviceIndex); QStringList channelNames; m_pluginManager->listTxChannels(channelNames); deviceGUI->setChannelNames(channelNames); @@ -1550,7 +1553,7 @@ void MainWindow::sampleMIMOAdd(Workspace *deviceWorkspace, Workspace *spectrumWo void MainWindow::sampleMIMOCreate( int deviceSetIndex, - int deviceIndex, + int& deviceIndex, DeviceUISet *deviceUISet ) { @@ -1580,7 +1583,7 @@ void MainWindow::sampleMIMOCreate( { qDebug("MainWindow::sampleMIMOCreate: non existent device replaced by Test MIMO"); int testMIMODeviceIndex = DeviceEnumerator::instance()->getTestMIMODeviceIndex(); - selectedDeviceIndex = testMIMODeviceIndex; + deviceIndex = testMIMODeviceIndex; samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(testMIMODeviceIndex); deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); @@ -1611,8 +1614,6 @@ void MainWindow::sampleMIMOCreateUI( ) { DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; - int selectedDeviceIndex = deviceIndex; - const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(deviceIndex); QWidget *gui; DeviceGUI *deviceGUI = deviceAPI->getPluginInterface()->createSampleMIMOPluginInstanceGUI( deviceAPI->getSamplingDeviceId(), @@ -1658,7 +1659,8 @@ void MainWindow::sampleMIMOCreateUI( deviceAPI->getSampleMIMO()->setMessageQueueToGUI(deviceGUI->getInputMessageQueue()); deviceUISet->m_deviceGUI = deviceGUI; - const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(selectedDeviceIndex); + const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(deviceIndex); + const PluginInterface::SamplingDevice *selectedDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); // FIXME: Why getRxSamplingDevice? deviceUISet->m_selectedDeviceId = selectedDevice->id; deviceUISet->m_selectedDeviceSerial = selectedDevice->serial; deviceUISet->m_selectedDeviceSequence = selectedDevice->sequence; @@ -1669,7 +1671,7 @@ void MainWindow::sampleMIMOCreateUI( deviceGUI->setIndex(deviceSetIndex); deviceGUI->setToolTip(samplingDevice->displayedName); deviceGUI->setTitle(samplingDevice->displayedName.split(" ")[0]); - deviceGUI->setCurrentDeviceIndex(selectedDeviceIndex); + deviceGUI->setCurrentDeviceIndex(deviceIndex); QStringList channelNames; QStringList tmpChannelNames; m_pluginManager->listMIMOChannels(channelNames); diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index ae6803ddca..6b7baf77bf 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -372,7 +372,7 @@ public slots: void sampleMIMOChange(int deviceSetIndex, int newDeviceIndex, Workspace *workspace); void sampleSourceCreate( int deviceSetIndex, - int deviceIndex, + int& deviceIndex, DeviceUISet *deviceUISet ); void sampleSourceCreateUI( @@ -382,7 +382,7 @@ public slots: ); void sampleSinkCreate( int deviceSetIndex, - int deviceIndex, + int& deviceIndex, DeviceUISet *deviceUISet ); void sampleSinkCreateUI( @@ -392,7 +392,7 @@ public slots: ); void sampleMIMOCreate( int deviceSetIndex, - int deviceIndex, + int& deviceIndex, DeviceUISet *deviceUISet ); void sampleMIMOCreateUI( From e3ec8759ed8da6795ac1b27c77c51c577b6df69a Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 10 Oct 2024 15:57:08 +0100 Subject: [PATCH 7/7] Remove unused variable --- sdrgui/mainwindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 16f01a870b..ebe0071d85 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -1401,7 +1401,6 @@ void MainWindow::sampleSinkCreate( ) { DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; - int selectedDeviceIndex = deviceIndex; DeviceEnumerator::instance()->changeTxSelection(deviceSetIndex, deviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceIndex); deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); @@ -1558,7 +1557,6 @@ void MainWindow::sampleMIMOCreate( ) { DeviceAPI *deviceAPI = deviceUISet->m_deviceAPI; - int selectedDeviceIndex = deviceIndex; DeviceEnumerator::instance()->changeMIMOSelection(deviceSetIndex, deviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(deviceIndex); deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);