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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-21 14:15:59 +01:00
parent 5f0575236e 167a6cff3e
commit 2067f47f34
3 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3733,10 +3733,12 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
case RECEIVER_STREAMING_PORT:
prev_streaming = enableDataStreamingFromReceiver();
enableDataStreamingFromReceiver(0);
enableDataStreamingToClient(0);
break;
case CLIENT_STREAMING_PORT:
prev_streaming = enableDataStreamingToClient();
enableDataStreamingToClient(0);
enableDataStreamingFromReceiver(0);
break;
case RECEIVER_STREAMING_SRC_IP:
prev_streaming = enableDataStreamingFromReceiver();
@ -3807,9 +3809,11 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
switch (p) {
case RECEIVER_STREAMING_PORT:
enableDataStreamingFromReceiver(1);
enableDataStreamingToClient(1);
break;
case CLIENT_STREAMING_PORT:
enableDataStreamingToClient(1);
enableDataStreamingFromReceiver(1);
break;
case RECEIVER_STREAMING_SRC_IP:
enableDataStreamingFromReceiver(1);