detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-08 22:00:03 +02:00
Code Issues Actions Packages Releases Activity

removed merge conflicts from bug fix of zmq buffering while acquire from command line

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-21 14:58:07 +01:00
parent 2067f47f34
commit 8328b30cbd
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3730,22 +3730,16 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
// disable data streaming before changing zmq port (but only if they were on) // disable data streaming before changing zmq port (but only if they were on)
int prev_streaming = 0; int prev_streaming = 0;
switch (p) { switch (p) {
case RECEIVER_STREAMING_PORT: case CLIENT_STREAMING_PORT:
case CLIENT_STREAMING_SRC_IP:
prev_streaming = enableDataStreamingFromReceiver(); prev_streaming = enableDataStreamingFromReceiver();
enableDataStreamingFromReceiver(0); enableDataStreamingFromReceiver(0);
enableDataStreamingToClient(0); enableDataStreamingToClient(0);
break; break;
case CLIENT_STREAMING_PORT: case RECEIVER_STREAMING_PORT:
prev_streaming = enableDataStreamingToClient();
enableDataStreamingToClient(0);
enableDataStreamingFromReceiver(0);
break;
case RECEIVER_STREAMING_SRC_IP: case RECEIVER_STREAMING_SRC_IP:
prev_streaming = enableDataStreamingFromReceiver(); prev_streaming = enableDataStreamingFromReceiver();
enableDataStreamingFromReceiver(0); enableDataStreamingFromReceiver(0);
break;
case CLIENT_STREAMING_SRC_IP:
prev_streaming = enableDataStreamingToClient();
enableDataStreamingToClient(0); enableDataStreamingToClient(0);
break; break;
default: break; default: break;
@ -3808,17 +3802,10 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
if (prev_streaming) { if (prev_streaming) {
switch (p) { switch (p) {
case RECEIVER_STREAMING_PORT: case RECEIVER_STREAMING_PORT:
enableDataStreamingFromReceiver(1);
enableDataStreamingToClient(1);
break;
case CLIENT_STREAMING_PORT: case CLIENT_STREAMING_PORT:
enableDataStreamingToClient(1);
enableDataStreamingFromReceiver(1);
break;
case RECEIVER_STREAMING_SRC_IP: case RECEIVER_STREAMING_SRC_IP:
enableDataStreamingFromReceiver(1);
break;
case CLIENT_STREAMING_SRC_IP: case CLIENT_STREAMING_SRC_IP:
enableDataStreamingFromReceiver(1);
enableDataStreamingToClient(1); enableDataStreamingToClient(1);
break; break;
default: break; default: break;