detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-03-13 16:12:49 +01:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-21 12:45:08 +02:00
parent 62c4bfab64
commit 4b0fb5029f
8 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@@ -3604,12 +3604,6 @@ void multiSlsDetector::registerAcquisitionFinishedCallback(
acqFinished_p = pArg;
}
void multiSlsDetector::registerProgressCallback(void (*func)(double, void *),
void *pArg) {
progress_call = func;
pProgressCallArg = pArg;
}
void multiSlsDetector::registerDataCallback(
void (*userCallback)(detectorData *, uint64_t, uint32_t, void *),
void *pArg) {
@@ -3733,10 +3727,6 @@ int multiSlsDetector::acquire() {
sem_post(&sem_newRTAcquisition);
dataProcessingThread.join();
if (progress_call != nullptr) {
progress_call(getCurrentProgress(), pProgressCallArg);
}
if (acquisition_finished != nullptr) {
acquisition_finished(getCurrentProgress(), getRunStatus(),
acqFinished_p);