detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 04:07:46 +01:00
Code Issues Actions Packages Releases Activity

changes for external gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-23 19:06:40 +02:00
parent 19d973f5d6
commit 0bea688a83
5 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -3590,11 +3590,11 @@ string multiSlsDetector::getNetworkParameter(networkParameter p) {
string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
// disable data streaming before changing zmq port (but only if they were on)
/*int prev_streaming = 0;*/
// if (p == RECEIVER_STREAMING_PORT) {
/*prev_streaming = getStreamingSocketsCreatedInClient();*/
// enableDataStreamingFromReceiver(0);
// }
int prev_streaming = 0;
if (p == RECEIVER_STREAMING_PORT) {
prev_streaming = getStreamingSocketsCreatedInClient();
enableDataStreamingFromReceiver(0);
}
if (s.find('+')==string::npos) {
@@ -3647,11 +3647,11 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
}
}
/*
//enable data streaming if it was on
if (p == RECEIVER_STREAMING_PORT && prev_streaming)
enableDataStreamingFromReceiver(1);
*/
return getNetworkParameter(p);
}
@@ -5874,8 +5874,10 @@ int multiSlsDetector::getStreamingSocketsCreatedInClient() {
int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
/* if(enable >= 0){
//create client sockets only if no external gui
if (!thisMultiDetector->externalgui) {
if(enable >= 0){
//destroy data threads
if(dataSocketsStarted)
createReceivingDataSockets(true);
@@ -5890,10 +5892,8 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
return -1;
}
}
}*/
}
}
int ret=-100;
@@ -5928,9 +5928,10 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
}
}
/* if(ret != dataSocketsStarted)
ret = -1;
*/
if (!thisMultiDetector->externalgui) {
if (ret != dataSocketsStarted)
ret = -1;
}
return ret;
}

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -1455,7 +1455,7 @@ class multiSlsDetector : public slsDetectorUtils {
Get external gui flag from shared memory
\returns external gui flag
*/
void getExternalGuiFlag();
bool getExternalGuiFlag();