detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

const qualifying

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-17 17:51:26 +02:00
parent b44039361d
commit 058de39d40
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3823,7 +3823,7 @@ void multiSlsDetector::processData() {
} }
bool multiSlsDetector::getJoinThreadFlag() { bool multiSlsDetector::getJoinThreadFlag() const {
std::lock_guard<std::mutex> lock(mp); std::lock_guard<std::mutex> lock(mp);
return jointhread; return jointhread;
} }

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1666,7 +1666,7 @@ private:
* Check if processing thread is ready to join main thread * Check if processing thread is ready to join main thread
* @returns true if ready, else false * @returns true if ready, else false
*/ */
bool getJoinThreadFlag(); bool getJoinThreadFlag() const;
/** /**
* Main thread sets if the processing thread should join it * Main thread sets if the processing thread should join it
@ -1713,10 +1713,10 @@ private:
int progressIndex; int progressIndex;
/** mutex to synchronize main and data processing threads */ /** mutex to synchronize main and data processing threads */
std::mutex mp; mutable std::mutex mp;
/** mutex to synchronizedata processing and plotting threads */ /** mutex to synchronizedata processing and plotting threads */
std::mutex mg; mutable std::mutex mg;
/** sets when the acquisition is finished */ /** sets when the acquisition is finished */
bool jointhread; bool jointhread;