ENH: change stop logic and convert hpi

Author: gabrielbmotta

applications/mne_scan/plugins/averaging/averaging.cpp

@@ -118,7 +118,10 @@ bool Averaging::start()
 bool Averaging::stop()
 {
     m_bProcessOutput = false;
-    m_OutputProcessingThread.join();
+
+    if(m_OutputProcessingThread.joinable()){
+        m_OutputProcessingThread.join();
+    }
 
     m_bPluginControlWidgetsInit = false;
 

applications/mne_scan/plugins/covariance/covariance.cpp

@@ -168,8 +168,9 @@ bool Covariance::start()
 
 bool Covariance::stop()
 {
+    m_bProcessOutput = false;
+
     if(m_OutputProcessingThread.joinable()){
-        m_bProcessOutput = false;
         m_OutputProcessingThread.join();
     }
 

applications/mne_scan/plugins/fiffsimulator/fiffsimulator.cpp

@@ -171,8 +171,9 @@ bool FiffSimulator::start()
 bool FiffSimulator::stop()
 {
     // Stop this (consumer) thread first
+    m_bProcessOutput = false;
+
     if(m_OutputProcessingThread.joinable()){
-        m_bProcessOutput = false;
         m_OutputProcessingThread.join();
     }
 

applications/mne_scan/plugins/hpi/hpi.cpp

@@ -105,8 +105,8 @@ Hpi::Hpi()
 
 Hpi::~Hpi()
 {
-    if(isRunning()) {
-        resetState();
+    if(m_bProcessOutput) {
+        stop();
     }
 }
 
@@ -144,7 +144,9 @@ void Hpi::unload()
 
 bool Hpi::start()
 {
-    QThread::start();
+    m_bProcessOutput = true;
+    m_OutputProcessingThread = std::thread(&Hpi::run, this);
+
 
     return true;
 }
@@ -153,7 +155,11 @@ bool Hpi::start()
 
 bool Hpi::stop()
 {
-    requestInterruption();
+    m_bProcessOutput = false;
+
+    if(m_OutputProcessingThread.joinable()){
+        m_OutputProcessingThread.join();
+    }
     resetState();
     return true;
 }
@@ -543,7 +549,7 @@ void Hpi::run()
         if(bFiffInfo) {
             break;
         }
-        msleep(100);
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 
     // init hpi fit
@@ -572,7 +578,7 @@ void Hpi::run()
 
     MatrixXd matDataMerged(m_pFiffInfo->chs.size(), fittingWindowSize);
 
-    while(!isInterruptionRequested()) {
+    while(m_bProcessOutput) {
         m_mutex.lock();
         if(fittingWindowSize != m_iFittingWindowSize) {
             fittingWindowSize = m_iFittingWindowSize;

applications/mne_scan/plugins/hpi/hpi.h

@@ -47,6 +47,8 @@
 
 #include <fiff/fiff_dig_point.h>
 
+#include <thread>
+
 //=============================================================================================================
 // QT INCLUDES
 //=============================================================================================================
@@ -320,6 +322,9 @@ class HPISHARED_EXPORT Hpi : public SCSHAREDLIB::AbstractAlgorithm
     SCSHAREDLIB::PluginInputData<SCMEASLIB::RealTimeMultiSampleArray>::SPtr     m_pHpiInput;            /**< The RealTimeMultiSampleArray of the Hpi input.*/
     SCSHAREDLIB::PluginOutputData<SCMEASLIB::RealTimeHpiResult>::SPtr           m_pHpiOutput;           /**< The RealTimeHpiResult of the Hpi output.*/
 
+    std::thread             m_OutputProcessingThread;
+    std::atomic_bool        m_bProcessOutput;
+
 signals:
     void errorsChanged(const QVector<double>& vErrors,
                        double dMeanErrorDist);