MAINT: get rid of wrapper class Thread. Get rid of redundant bool.

Author: gabrielbmotta

applications/mne_scan/libs/scShared/Plugins/threads.h

@@ -103,7 +103,6 @@ SOURCES += \
     Management/displaymanager.cpp
 
 HEADERS += \
-    Plugins/threads.h \
     scshared_global.h \
     Plugins/abstractplugin.h \
     Plugins/abstractsensor.h \

applications/mne_scan/libs/scShared/scShared.pro

@@ -87,8 +87,7 @@ FiffSimulator::FiffSimulator()
 , m_pCircularBuffer(QSharedPointer<CircularBuffer_Matrix_float>(new CircularBuffer_Matrix_float(40)))
 , m_pRtCmdClient(QSharedPointer<RtCmdClient>::create())
 , m_iDefaultPortCmdClient(4217)
-, m_OutputProcessingThreadRunning(false)
-, m_StopOutputProcessingThread(false)
+, m_bProcessOutput(false)
 {
     //init channels when fiff info is available
     connect(this, &FiffSimulator::fiffInfoAvailable,
@@ -99,7 +98,7 @@ FiffSimulator::FiffSimulator()
 
 FiffSimulator::~FiffSimulator()
 {
-    if(m_pFiffSimulatorProducer->isRunning() || m_OutputProcessingThreadRunning) {
+    if(m_pFiffSimulatorProducer->isRunning() || m_OutputProcessingThread.joinable()) {
         stop();
     }
 }
@@ -158,8 +157,8 @@ bool FiffSimulator::start()
         (*m_pRtCmdClient)["start"].pValues()[0].setValue(m_pFiffSimulatorProducer->m_iDataClientId);
         (*m_pRtCmdClient)["start"].send();
 
+        m_bProcessOutput = true;
         m_OutputProcessingThread = std::thread(&FiffSimulator::run, this);
-        m_OutputProcessingThreadRunning = true;
 
         return true;
     }
@@ -172,9 +171,10 @@ bool FiffSimulator::start()
 bool FiffSimulator::stop()
 {
     // Stop this (consumer) thread first
-    m_StopOutputProcessingThread = true;
-    m_OutputProcessingThread.join();
-    m_OutputProcessingThreadRunning = false;
+    if(m_OutputProcessingThread.joinable()){
+        m_bProcessOutput = false;
+        m_OutputProcessingThread.join();
+    }
 
     // Stop producer thread second
     m_pFiffSimulatorProducer->stop();
@@ -188,8 +188,6 @@ bool FiffSimulator::stop()
     m_pRTMSA_FiffSimulator->measurementData()->clear();
     m_pCircularBuffer->clear();
 
-    m_StopOutputProcessingThread = false;
-
     return true;
 }
 
@@ -222,11 +220,11 @@ void FiffSimulator::run()
 {
     MatrixXf matValue;
 
-    while(!m_StopOutputProcessingThread) {
+    while(m_bProcessOutput) {
         //pop matrix
         if(m_pCircularBuffer->pop(matValue)) {
             //emit values
-            if(!m_StopOutputProcessingThread) {
+            if(m_bProcessOutput) {
                 m_pRTMSA_FiffSimulator->measurementData()->setValue(matValue.cast<double>());
             }
         }

applications/mne_scan/plugins/fiffsimulator/fiffsimulator.cpp

@@ -215,8 +215,7 @@ class FIFFSIMULATORSHARED_EXPORT FiffSimulator : public SCSHAREDLIB::AbstractSen
     QMutex                  m_qMutex;                       /**< The mutex to ensure thread safety.*/
 
     std::thread             m_OutputProcessingThread;
-    std::atomic_bool        m_OutputProcessingThreadRunning;
-    std::atomic_bool        m_StopOutputProcessingThread;
+    std::atomic_bool        m_bProcessOutput;
 
 signals:
     //=========================================================================================================

applications/mne_scan/plugins/fiffsimulator/fiffsimulator.h

@@ -178,7 +178,7 @@ void FiffSimulatorProducer::run()
         m_producerMutex.unlock();
 
         // Only perform data reading if the measurement was started
-        if(m_pFiffSimulator->m_OutputProcessingThreadRunning) {
+        if(m_pFiffSimulator->m_bProcessOutput) {
             m_pRtDataClient->readRawBuffer(m_pFiffSimulator->m_pFiffInfo->nchan,
                                            matData,
                                            kind);