Merge pull request #2274 from srcejon/freq_scanner

MainWindow: Add FSMs to avoid blocking on GUI Thread

CMakeLists.txt

@@ -704,6 +704,7 @@ if (BUILD_GUI)
                             QuickWidgets
                             Svg
                             SvgWidgets
+                            StateMachine
                            OPTIONAL_COMPONENTS
                             WebEngineQuick
                             WebEngineCore

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))

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_

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))

sdrbase/dsp/dspdevicesinkengine.h

@@ -121,6 +121,10 @@ private slots:
 
 signals:
 	void stateChanged();
+
+	void generationStopped();
+	void sampleSet();
+	void spectrumSinkRemoved();
 };
 
 

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;

sdrbase/dsp/dspdevicesourceengine.h

@@ -142,6 +142,10 @@ private slots:
 
 signals:
 	void stateChanged();
+
+	void acquistionStopped();
+	void sampleSet();
+	void sinkRemoved();
 };
 
 #endif // INCLUDE_DSPDEVICEENGINE_H

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)

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; }
 

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
   )

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->accept();
+    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()

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);