detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

zmq streaming should work with external gui now

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-27 16:01:12 +01:00
parent 65d7922286
commit 386ef7766c
11 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -208,7 +208,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
thisMultiDetector->acquiringFlag = false;
thisMultiDetector->externalgui = false;
thisMultiDetector->receiver_datastream = false;
thisMultiDetector->receiver_upstream = false;
thisMultiDetector->alreadyExisting=1;
}
@ -274,7 +274,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
getNMods();
getMaxMods();
client_datastream = false;
client_downstream = false;
for(int i=0;i<MAXDET;++i)
zmqSocket[i] = 0;
threadpool = 0;
@ -3690,21 +3690,6 @@ 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;
switch (p) {
case CLIENT_STREAMING_PORT:
prev_streaming = enableDataStreamingToClient();
if (enableDataStreamingToClient()) enableDataStreamingToClient(0);
break;
case RECEIVER_STREAMING_PORT:
prev_streaming = enableDataStreamingFromReceiver();
if (enableDataStreamingFromReceiver()) enableDataStreamingFromReceiver(0);
break;
default: break;
}
if (s.find('+')==string::npos) {
if(!threadpool){
@ -3757,19 +3742,6 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
}
//enable data streaming if it was on
if (prev_streaming) {
switch (p) {
case CLIENT_STREAMING_PORT:
enableDataStreamingToClient(1);
break;
case RECEIVER_STREAMING_PORT:
enableDataStreamingFromReceiver(1);
break;
default: break;
}
}
return getNetworkParameter(p);
}
@ -5680,7 +5652,7 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
zmqSocket[i] = 0;
}
}
client_datastream = false;
client_downstream = false;
cout << "Destroyed Receiving Data Socket(s)" << endl;
return OK;
}
@ -5701,7 +5673,7 @@ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
printf("Zmq Client[%d] at %s\n",i, zmqSocket[i]->GetZmqServerAddress());
}
client_datastream = true;
client_downstream = true;
cout << "Receiving Data Socket(s) created" << endl;
return OK;
}
@ -6192,7 +6164,7 @@ int multiSlsDetector::enableDataStreamingToClient(int enable) {
}
}
}
return client_datastream;
return client_downstream;
}
int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
@ -6228,10 +6200,10 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
}
}
}
thisMultiDetector->receiver_datastream = ret;
thisMultiDetector->receiver_upstream = ret;
}
return thisMultiDetector->receiver_datastream;
return thisMultiDetector->receiver_upstream;
}
int multiSlsDetector::enableReceiverCompression(int i){

13
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -205,7 +205,7 @@ class multiSlsDetector : public slsDetectorUtils {
int receiverOnlineFlag;
/** data streaming (up stream) enable in receiver */
bool receiver_datastream;
bool receiver_upstream;
} sharedMultiSlsDetector;
@ -998,6 +998,15 @@ class multiSlsDetector : public slsDetectorUtils {
string getNetworkParameter(networkParameter);
/**
sets the network parameters
must restart streaming in client/receiver if to do with zmq after calling this function
\param i network parameter type
\param s value to be set
\returns parameter
*/
string setNetworkParameter(networkParameter, std::string);
int setPort(portType, int);
int lockServer(int);
@ -1490,7 +1499,7 @@ private:
/** data streaming (down stream) enabled in client (zmq sckets created) */
bool client_datastream;
bool client_downstream;
/** ZMQ Socket - Receiver to Client */
ZmqSocket* zmqSocket[MAXDET];