detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-21 08:51:41 +01:00
Code Issues Actions Packages Releases Activity

bugfix zmq streaming both on

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-23 17:28:35 +01:00
parent dc5384f0f9
commit 5eb8402742
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -3695,12 +3695,8 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
int prev_streaming = 0; int prev_streaming = 0;
switch (p) { switch (p) {
case RECEIVER_STREAMING_PORT: case RECEIVER_STREAMING_PORT:
prev_streaming = enableDataStreamingFromReceiver();
if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0);
if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0);
break;
case CLIENT_STREAMING_PORT: case CLIENT_STREAMING_PORT:
prev_streaming = enableDataStreamingToClient(); prev_streaming = (enableDataStreamingFromReceiver() || enableDataStreamingToClient());
if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0); if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0);
if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0); if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0);
break; break;
@@ -3764,12 +3760,9 @@ 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); enableDataStreamingFromReceiver(1);
enableDataStreamingToClient(1);
break; break;
default: break; default: break;
} }