ENH: convert averaging plugin

Author: gabrielbmotta

applications/mne_scan/plugins/averaging/averaging.cpp

@@ -77,14 +77,15 @@ using namespace Eigen;
 
 Averaging::Averaging()
 : m_pCircularBuffer(CircularBuffer<FIFFLIB::FiffEvokedSet>::SPtr::create(40))
+, m_bProcessOutput(false)
 {
 }
 
 //=============================================================================================================
 
 Averaging::~Averaging()
 {
-    if(this->isRunning())
+    if(m_OutputProcessingThread.joinable())
         stop();
 }
 
@@ -106,17 +107,18 @@ void Averaging::unload()
 
 bool Averaging::start()
 {
-    QThread::start();
+    m_bProcessOutput = true;
+    m_OutputProcessingThread = std::thread(&Averaging::run, this);
 
     return true;
 }
 
 //=============================================================================================================
 
 bool Averaging::stop()
-{    
-    requestInterruption();
-    wait(500);
+{
+    m_bProcessOutput = false;
+    m_OutputProcessingThread.join();
 
     m_bPluginControlWidgetsInit = false;
 
@@ -406,7 +408,7 @@ void Averaging::onChangeBaselineActive(bool state)
 void Averaging::onNewEvokedSet(const FIFFLIB::FiffEvokedSet& evokedSet,
                                const QStringList& lResponsibleTriggerTypes)
 {
-    if(!this->isRunning()) {
+    if(!m_bProcessOutput) {
         return;
     }
 
@@ -439,7 +441,7 @@ void Averaging::run()
     FIFFLIB::FiffEvokedSet evokedSet;
     QStringList lResponsibleTriggerTypes;
 
-    while(!isInterruptionRequested()){
+    while(m_bProcessOutput){
         if(m_pCircularBuffer->pop(evokedSet)) {
             m_qMutex.lock();
             lResponsibleTriggerTypes = m_lResponsibleTriggerTypes;

applications/mne_scan/plugins/averaging/averaging.h

@@ -47,6 +47,8 @@
 
 #include <fiff/fiff_evoked_set.h>
 
+#include <thread>
+
 //=============================================================================================================
 // QT INCLUDES
 //=============================================================================================================
@@ -237,6 +239,9 @@ class AVERAGINGSHARED_EXPORT Averaging : public SCSHAREDLIB::AbstractAlgorithm
 
     QMap<QString,int>                               m_mapStimChsIndexNames;             /**< The currently available stim channels and their corresponding index in the data. */
 
+    std::thread             m_OutputProcessingThread;
+    std::atomic_bool        m_bProcessOutput;
+
 signals:
     void stimChannelsChanged(const QMap<QString,int>& mapStimChsIndexNames);
     void fiffChInfoChanged(const QList<FIFFLIB::FiffChInfo>& fiffChInfoList);