MAINT: onverting covariance plugin

Author: gabrielbmotta

applications/mne_scan/plugins/averaging/averaging.cpp

@@ -85,7 +85,7 @@ Averaging::Averaging()
 
 Averaging::~Averaging()
 {
-    if(m_OutputProcessingThread.joinable())
+    if(m_bProcessOutput)
         stop();
 }
 

applications/mne_scan/plugins/covariance/covariance.cpp

@@ -89,7 +89,7 @@ Covariance::Covariance()
 
 Covariance::~Covariance()
 {
-    if(this->isRunning())
+    if(m_bProcessOutput)
         stop();
 }
 
@@ -158,7 +158,8 @@ void Covariance::unload()
 bool Covariance::start()
 {
     // Start thread
-    QThread::start();
+    m_bProcessOutput = true;
+    m_OutputProcessingThread = std::thread(&Covariance::run, this);
 
     return true;
 }
@@ -167,8 +168,10 @@ bool Covariance::start()
 
 bool Covariance::stop()
 {
-    requestInterruption();
-    wait(500);
+    if(m_OutputProcessingThread.joinable()){
+        m_bProcessOutput = false;
+        m_OutputProcessingThread.join();
+    }
 
     m_bPluginControlWidgetsInit = false;
 
@@ -249,7 +252,7 @@ void Covariance::run()
             break;
         }
         m_mutex.unlock();
-        msleep(100);
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 
     MatrixXd matData;
@@ -260,7 +263,7 @@ void Covariance::run()
     RTPROCESSINGLIB::RtCov rtCov(m_pFiffInfo);
 
     // Start processing data
-    while(!isInterruptionRequested()) {
+    while(m_bProcessOutput) {
         // Get the current data
         if(m_pCircularBuffer->pop(matData)) {
             m_mutex.lock();

applications/mne_scan/plugins/covariance/covariance.h

@@ -45,6 +45,8 @@
 #include <scShared/Plugins/abstractalgorithm.h>
 #include <utils/generics/circularbuffer.h>
 
+#include <thread>
+
 //=============================================================================================================
 // EIGEN INCLUDES
 //=============================================================================================================
@@ -164,6 +166,9 @@ class COVARIANCESHARED_EXPORT Covariance : public SCSHAREDLIB::AbstractAlgorithm
     QSharedPointer<SCSHAREDLIB::PluginInputData<SCMEASLIB::RealTimeMultiSampleArray> >  m_pCovarianceInput;     /**< The RealTimeMultiSampleArray of the Covariance input.*/
     QSharedPointer<SCSHAREDLIB::PluginOutputData<SCMEASLIB::RealTimeCov> >              m_pCovarianceOutput;    /**< The RealTimeCov of the Covariance output.*/
 
+    std::thread             m_OutputProcessingThread;
+    std::atomic_bool        m_bProcessOutput;
+
 signals:
 };
 } // NAMESPACE

applications/mne_scan/plugins/fiffsimulator/fiffsimulator.cpp

@@ -98,7 +98,7 @@ FiffSimulator::FiffSimulator()
 
 FiffSimulator::~FiffSimulator()
 {
-    if(m_pFiffSimulatorProducer->isRunning() || m_OutputProcessingThread.joinable()) {
+    if(m_pFiffSimulatorProducer->isRunning() || m_bProcessOutput) {
         stop();
     }
 }