Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal
2017-09-19 17:19:36 +02:00
14 changed files with 1500 additions and 980 deletions

View File

@ -204,6 +204,9 @@ class multiSlsDetector : public slsDetectorUtils {
/** external gui */
bool externalgui;
/** receiver online flag - is set if the receiver is connected, unset if socket connection is not possible */
int receiverOnlineFlag;
} sharedMultiSlsDetector;
@ -1233,6 +1236,11 @@ class multiSlsDetector : public slsDetectorUtils {
*/
int getFramesCaughtByReceiver();
/** gets the number of frames caught by any one receiver (to avoid using threadpool)
\returns number of frames caught by any one receiver (master receiver if exists)
*/
int getFramesCaughtByAnyReceiver();
/** gets the current frame index of receiver
\returns current frame index of receiver
*/