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

This commit is contained in:
Dhanya Maliakal
2017-11-21 14:57:52 +01:00
4 changed files with 75 additions and 3 deletions

View File

@ -170,6 +170,10 @@ private slots:
*/
void SetReceiver();
/** Restart data streaming in receiver and gui
*/
void RestartStreaming();
/** Add ROI Input if the value changed in the last slot
*/
void AddROIInputSlot(){AddROIInput(1);};