mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-23 23:10:02 +02:00
in between
This commit is contained in:
parent
a236a7a9aa
commit
bdccddfe97
@ -207,6 +207,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
|
||||
|
||||
thisMultiDetector->receiver_read_freq = 0;
|
||||
thisMultiDetector->acquiringFlag = false;
|
||||
thisMultiDetector->externalgui = false;
|
||||
thisMultiDetector->alreadyExisting=1;
|
||||
}
|
||||
|
||||
@ -6255,3 +6256,12 @@ void multiSlsDetector::setAcquiringFlag(bool b){
|
||||
bool multiSlsDetector::getAcquiringFlag(){
|
||||
return thisMultiDetector->acquiringFlag;
|
||||
}
|
||||
|
||||
|
||||
void multiSlsDetector::setExternalGuiFlag(bool b){
|
||||
thisMultiDetector->externalgui = b;
|
||||
}
|
||||
|
||||
bool multiSlsDetector::getExternalGuiFlag(){
|
||||
return thisMultiDetector->externalgui;
|
||||
}
|
||||
|
@ -201,6 +201,9 @@ class multiSlsDetector : public slsDetectorUtils {
|
||||
/** flag for acquiring */
|
||||
bool acquiringFlag;
|
||||
|
||||
/** external gui */
|
||||
bool externalgui;
|
||||
|
||||
} sharedMultiSlsDetector;
|
||||
|
||||
|
||||
@ -1442,6 +1445,19 @@ class multiSlsDetector : public slsDetectorUtils {
|
||||
*/
|
||||
bool getAcquiringFlag();
|
||||
|
||||
/**
|
||||
Set external gui flag in shared memory
|
||||
\param b set external gui flag
|
||||
*/
|
||||
void setExternalGuiFlag(bool b=false);
|
||||
|
||||
/**
|
||||
Get external gui flag from shared memory
|
||||
\returns external gui flag
|
||||
*/
|
||||
void getExternalGuiFlag();
|
||||
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
@ -9074,3 +9074,15 @@ void slsDetector::setAcquiringFlag(bool b){
|
||||
bool slsDetector::getAcquiringFlag(){
|
||||
return thisDetector->acquiringFlag;
|
||||
}
|
||||
|
||||
|
||||
void slsDetector::setExternalGuiFlag(bool b){
|
||||
pthread_mutex_lock(&ms);
|
||||
parentDet->setExternalGuiFlag(b);
|
||||
pthread_mutex_unlock(&ms);
|
||||
}
|
||||
|
||||
bool slsDetector::getExternalGuiFlag(){
|
||||
return parentDet->getExternalGuiFlag();
|
||||
}
|
||||
|
||||
|
@ -1884,6 +1884,18 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
|
||||
*/
|
||||
bool getAcquiringFlag();
|
||||
|
||||
/**
|
||||
Set external gui flag in shared memory
|
||||
\param b set external gui flag
|
||||
*/
|
||||
void setExternalGuiFlag(bool b=false);
|
||||
|
||||
/**
|
||||
Get external gui flag from shared memory
|
||||
\returns external gui flag
|
||||
*/
|
||||
void getExternalGuiFlag();
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user