From bdccddfe974460535599f19a26f92396b966444e Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Wed, 23 Aug 2017 18:24:48 +0200
Subject: [PATCH] in between

---
 .../multiSlsDetector/multiSlsDetector.cpp        | 10 ++++++++++
 .../multiSlsDetector/multiSlsDetector.h          | 16 ++++++++++++++++
 slsDetectorSoftware/slsDetector/slsDetector.cpp  | 12 ++++++++++++
 slsDetectorSoftware/slsDetector/slsDetector.h    | 12 ++++++++++++
 4 files changed, 50 insertions(+)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index b577290f1..a341d2013 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -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;
+}
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 3a095a20d..feba8e9ab 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -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:
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 6d63bcb77..792b86e0a 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -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();
+}
+
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h
index d6005448b..a44770a9e 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.h
+++ b/slsDetectorSoftware/slsDetector/slsDetector.h
@@ -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: