MAINT: convert writetofile

mne-tools · Jan 26, 2022 · bb6e7aa · bb6e7aa
1 parent 96f03e3
commit bb6e7aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/applications/mne_scan/plugins/writetofile/writetofile.cpp b/applications/mne_scan/plugins/writetofile/writetofile.cpp
@@ -111,7 +111,7 @@ WriteToFile::WriteToFile()
 
 WriteToFile::~WriteToFile()
 {
-    if(this->isRunning()) {
+    if(m_bProcessOutput) {
         stop();
     }
 }
@@ -145,7 +145,8 @@ void WriteToFile::unload()
 
 bool WriteToFile::start()
 {
-    QThread::start();
+    m_bProcessOutput = true;
+    m_OutputProcessingThread = std::thread(&WriteToFile::run, this);
 
     return true;
 }
@@ -154,8 +155,11 @@ bool WriteToFile::start()
 
 bool WriteToFile::stop()
 {
-    requestInterruption();
-    wait();
+    m_bProcessOutput = false;
+
+    if(m_OutputProcessingThread.joinable()){
+        m_OutputProcessingThread.join();
+    }
 
     m_bPluginControlWidgetsInit = false;
 
@@ -293,7 +297,7 @@ void WriteToFile::run()
     MatrixXd matData;
     qint32 size = 0;
 
-    while(!isInterruptionRequested()) {
+    while(m_bProcessOutput) {
         if(m_pCircularBuffer) {
             //pop matrix
 

diff --git a/applications/mne_scan/plugins/writetofile/writetofile.h b/applications/mne_scan/plugins/writetofile/writetofile.h
@@ -46,6 +46,8 @@
 #include <scShared/Plugins/abstractalgorithm.h>
 #include <fiff/fifffilesharer.h>
 
+#include <thread>
+
 //=============================================================================================================
 // QT INCLUDES
 //=============================================================================================================
@@ -310,6 +312,9 @@ class WRITETOFILESHARED_EXPORT WriteToFile : public SCSHAREDLIB::AbstractAlgorit
     FIFFLIB::FiffFileSharer                 m_FileSharer;                   /**< Handles copying recording file and saving copy to shared directory. */
 
     QStringList                             m_lFileNames;                   /**< List of file names of latest recording */
+
+    std::thread             m_OutputProcessingThread;
+    std::atomic_bool        m_bProcessOutput;
 };
 } // NAMESPACE