Skip to content

Commit 18f0d33

Browse files
committed
MAINT: add missing initilizations of bools.
1 parent 9cc2d1d commit 18f0d33

File tree

19 files changed

+39
-7
lines changed

19 files changed

+39
-7
lines changed

src/applications/mne_scan/plugins/averaging/averaging.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include <fiff/fiff_evoked_set.h>
4949

5050
#include <thread>
51+
#include <atomic>
5152

5253
//=============================================================================================================
5354
// QT INCLUDES

src/applications/mne_scan/plugins/babymeg/babymeg.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ BabyMEG::BabyMEG()
8888
, m_sFiffProjections(QCoreApplication::applicationDirPath() + "/../resources/mne_scan/plugins/babymeg/header.fif")
8989
, m_sFiffCompensators(QCoreApplication::applicationDirPath() + "/../resources/mne_scan/plugins/babymeg/compensator.fif")
9090
, m_sBadChannels(QCoreApplication::applicationDirPath() + "/../resources/mne_scan/plugins/babymeg/both.bad")
91+
, m_bProcessOutput(false)
9192
{
9293
m_pActionSqdCtrl = new QAction(QIcon(":/images/sqdctrl.png"), tr("Squid Control"),this);
9394
// m_pActionSetupProject->setShortcut(tr("F12"));
@@ -107,7 +108,7 @@ BabyMEG::BabyMEG()
107108

108109
BabyMEG::~BabyMEG()
109110
{
110-
if(this->isRunning()) {
111+
if(m_bProcessOutput) {
111112
stop();
112113
}
113114

@@ -208,7 +209,8 @@ bool BabyMEG::start()
208209
initConnector();
209210

210211
// Start thread
211-
QThread::start();
212+
m_bProcessOutput = true;
213+
m_OutputProcessingThread = std::thread(&BabyMEG::run, this);
212214

213215
return true;
214216
}
@@ -217,8 +219,11 @@ bool BabyMEG::start()
217219

218220
bool BabyMEG::stop()
219221
{
220-
requestInterruption();
221-
wait(2000);
222+
m_bProcessOutput = false;
223+
224+
if(m_OutputProcessingThread.joinable()){
225+
m_OutputProcessingThread.join();
226+
}
222227

223228
// Clear all data in the buffer connected to displays and other plugins
224229
m_pRTMSABabyMEG->measurementData()->clear();
@@ -260,13 +265,13 @@ void BabyMEG::run()
260265
{
261266
MatrixXf matValue;
262267

263-
while(!isInterruptionRequested()) {
268+
while(m_bProcessOutput) {
264269
//pop matrix
265270
if(m_pCircularBuffer->pop(matValue)) {
266271
//Create digital trigger information
267272
createDigTrig(matValue);
268273

269-
if(!isInterruptionRequested()) {
274+
if(m_bProcessOutput) {
270275
m_pRTMSABabyMEG->measurementData()->setValue(this->calibrate(matValue));
271276
}
272277
}
@@ -352,7 +357,7 @@ void BabyMEG::setFiffData(QByteArray data)
352357
IOUtils::swap_floatp(rawData.data()+i);
353358
}
354359

355-
if(this->isRunning()) {
360+
if(m_bProcessOutput) {
356361
while(!m_pCircularBuffer->push(rawData)) {
357362
//Do nothing until the circular buffer is ready to accept new data again
358363
}

src/applications/mne_scan/plugins/babymeg/babymeg.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
#include <scShared/Plugins/abstractsensor.h>
5151
#include <utils/generics/circularbuffer.h>
5252

53+
#include <thread>
54+
#include <atomic>
55+
5356
//=============================================================================================================
5457
// QT INCLUDES
5558
//=============================================================================================================
@@ -319,6 +322,8 @@ class BABYMEGSHARED_EXPORT BabyMEG : public SCSHAREDLIB::AbstractSensor
319322
QPointer<QAction> m_pActionSqdCtrl; /**< show squid control. */
320323
QPointer<QAction> m_pActionUpdateFiffInfo; /**< Update Fiff Info action. */
321324

325+
std::thread m_OutputProcessingThread;
326+
std::atomic_bool m_bProcessOutput;
322327
signals:
323328
//=========================================================================================================
324329
/**

src/applications/mne_scan/plugins/brainamp/brainamp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ BrainAMP::BrainAMP()
8484
, m_sRPA("2RD")
8585
, m_sNasion("0Z")
8686
, m_pCircularBuffer(QSharedPointer<CircularBuffer_Matrix_double>(new CircularBuffer_Matrix_double(8)))
87+
, m_bProcessOutput(false)
8788
{
8889
// Create record file option action bar item/button
8990
m_pActionSetupProject = new QAction(QIcon(":/images/database.png"), tr("Setup project"), this);

src/applications/mne_scan/plugins/brainamp/brainamp.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
#include <scShared/Plugins/abstractsensor.h>
4848
#include <utils/generics/circularbuffer.h>
4949

50+
#include <thread>
51+
#include <atomic>
52+
5053
//=============================================================================================================
5154
// QT INCLUDES
5255
//=============================================================================================================
@@ -232,6 +235,9 @@ protected slots:
232235
QAction* m_pActionSetupStimulus; /**< starts stimulus feature. */
233236

234237
QMutex m_mutex;
238+
239+
std::thread m_OutputProcessingThread;
240+
std::atomic_bool m_bProcessOutput;
235241
};
236242
} // NAMESPACE
237243

src/applications/mne_scan/plugins/covariance/covariance.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ using namespace Eigen;
8282
Covariance::Covariance()
8383
: m_iEstimationSamples(2000)
8484
, m_pCircularBuffer(CircularBuffer_Matrix_double::SPtr::create(40))
85+
, m_bProcessOutput(false)
8586
{
8687
}
8788

src/applications/mne_scan/plugins/covariance/covariance.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include <utils/generics/circularbuffer.h>
4747

4848
#include <thread>
49+
#include <atomic>
4950

5051
//=============================================================================================================
5152
// EIGEN INCLUDES

src/applications/mne_scan/plugins/hpi/hpi.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Hpi::Hpi()
9797
, m_bUseSSP(false)
9898
, m_bUseComp(false)
9999
, m_pCircularBuffer(CircularBuffer_Matrix_double::SPtr::create(40))
100+
, m_bProcessOutput(false)
100101
{
101102
connect(this, &Hpi::devHeadTransAvailable,
102103
this, &Hpi::onDevHeadTransAvailable, Qt::BlockingQueuedConnection);

src/applications/mne_scan/plugins/hpi/hpi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include <fiff/fiff_dig_point.h>
4949

5050
#include <thread>
51+
#include <atomic>
5152

5253
//=============================================================================================================
5354
// QT INCLUDES

src/applications/mne_scan/plugins/neuronalconnectivity/neuronalconnectivity.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ NeuronalConnectivity::NeuronalConnectivity()
9595
, m_pCircularBuffer(CircularBuffer<CONNECTIVITYLIB::Network>::SPtr::create(40))
9696
, m_pRtConnectivity(RtConnectivity::SPtr::create())
9797
, m_pActionShowYourWidget(Q_NULLPTR)
98+
, m_bProcessOutput(false)
9899
{
99100
AbstractMetric::m_bStorageModeIsActive = true;
100101
AbstractMetric::m_iNumberBinStart = 0;

0 commit comments

Comments
 (0)