mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 10:07:59 +02:00
removed merge conflicts from bug fix of zmq buffering while acquire from command line
This commit is contained in:
@ -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);};
|
||||
|
Reference in New Issue
Block a user