detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-27 00:30:03 +02:00
Code Issues Actions Packages Releases Activity

unregistering call back, detangling receiver streaming from callback

Browse Source
This commit is contained in:
maliakal_d 2020-01-06 11:50:08 +01:00
parent 54bedeaa0a
commit 75838f77b3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -373,6 +373,9 @@ void qDrawPlot::SetupWidgetWindow(){
// callbacks // callbacks
// Setting the callback function to get data from detector class // Setting the callback function to get data from detector class
if (setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) {
enableDataStreamingFromReceiver(1);
}
myDet->registerDataCallback(&(GetDataCallBack),this); // also enables data streaming in client and receiver (if receiver exists) myDet->registerDataCallback(&(GetDataCallBack),this); // also enables data streaming in client and receiver (if receiver exists)
//Setting the callback function to alert when acquisition finished from detector class //Setting the callback function to alert when acquisition finished from detector class
myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this); myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this);

5
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -239,10 +239,7 @@ s
void registerDataCallback(int( *userCallback)(detectorData*, int, int, void*), void *pArg) { \ void registerDataCallback(int( *userCallback)(detectorData*, int, int, void*), void *pArg) { \
dataReady = userCallback; \ dataReady = userCallback; \
pCallbackArg = pArg; \ pCallbackArg = pArg; \
if (setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) { \ enableDataStreamingToClient(dataReady == NULL ? 0 : 1);}; \
enableDataStreamingToClient(1); \
enableDataStreamingFromReceiver(1);}}; \
void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;}; void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};