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

4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back

Browse Source
This commit is contained in:
maliakal_d 2020-02-03 11:25:19 +01:00
parent a3c686d271
commit e432e6f90d
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -330,9 +330,11 @@ void qDrawPlot::SetDataCallBack(bool enable) {
FILE_LOG(logINFO) << "Setting data call back to " << std::boolalpha << enable << std::noboolalpha; FILE_LOG(logINFO) << "Setting data call back to " << std::boolalpha << enable << std::noboolalpha;
if (enable) { if (enable) {
isPlot = true; isPlot = true;
det->setRxZmqDataStream(true);
det->registerDataCallback(&(GetDataCallBack), this); det->registerDataCallback(&(GetDataCallBack), this);
} else { } else {
isPlot = false; isPlot = false;
det->setRxZmqDataStream(false);
det->registerDataCallback(nullptr, this); det->registerDataCallback(nullptr, this);
} }

10
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -958,15 +958,7 @@ void multiSlsDetector::registerDataCallback(
void *pArg) { void *pArg) {
dataReady = userCallback; dataReady = userCallback;
pCallbackArg = pArg; pCallbackArg = pArg;
if (Parallel(&slsDetector::getUseReceiverFlag, {}).squash(false)) { enableDataStreamingToClient(dataReady == nullptr ? 0 : 1);
if (dataReady == nullptr) {
enableDataStreamingToClient(0);
Parallel(&slsDetector::enableDataStreamingFromReceiver, {}, 0);
} else {
enableDataStreamingToClient(1);
Parallel(&slsDetector::enableDataStreamingFromReceiver, {}, 1);
}
}
} }
double multiSlsDetector::setTotalProgress() { double multiSlsDetector::setTotalProgress() {

2
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -1164,7 +1164,7 @@ void slsDetector::stopAcquisition() {
void slsDetector::sendSoftwareTrigger() { void slsDetector::sendSoftwareTrigger() {
FILE_LOG(logDEBUG1) << "Sending software trigger"; FILE_LOG(logDEBUG1) << "Sending software trigger";
sendToDetector(F_SOFTWARE_TRIGGER); sendToDetectorStop(F_SOFTWARE_TRIGGER);
FILE_LOG(logDEBUG1) << "Sending software trigger successful"; FILE_LOG(logDEBUG1) << "Sending software trigger successful";
} }