detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 10:00:40 +02:00
Code Issues Actions Packages Releases Activity

formatting and versioning

Browse Source
This commit is contained in:
maliakal_d 2023-11-08 11:43:09 +01:00
parent af3dc1e7f4
commit 14e11e8b5b
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -850,8 +850,8 @@ void qTabMeasurement::GetNextFrameNumber() {
spinNextFrameNumber->setValue(retval); spinNextFrameNumber->setValue(retval);
} }
CATCH_HANDLE("Could not get starting frame number.", CATCH_HANDLE("Could not get starting frame number.",
"qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber, "qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber,
&QSpinBox::setValue, -1) &QSpinBox::setValue, -1)
connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this, connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetNextFrameNumber(int))); SLOT(SetNextFrameNumber(int)));
} }

8
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1243,17 +1243,17 @@ int DetectorImpl::acquire() {
// handle jf sync issue (master idle, slaves stopped) // handle jf sync issue (master idle, slaves stopped)
if (statusList.contains_only(IDLE, STOPPED)) { if (statusList.contains_only(IDLE, STOPPED)) {
status = STOPPED; status = STOPPED;
} } else
else
status = statusList.squash(RUNNING); status = statusList.squash(RUNNING);
} }
// progress // progress
auto a = Parallel(&Module::getReceiverProgress, {}); auto a = Parallel(&Module::getReceiverProgress, {});
double progress = (*std::max_element(a.begin(), a.end())); double progress = (*std::max_element(a.begin(), a.end()));
// callback // callback
acquisition_finished(progress, static_cast<int>(status), acqFinished_p); acquisition_finished(progress, static_cast<int>(status),
acqFinished_p);
} }
clock_gettime(CLOCK_REALTIME, &end); clock_gettime(CLOCK_REALTIME, &end);

16
slsSupportLib/include/sls/versionAPI.h
View File

@ -2,12 +2,12 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
/** API versions */ /** API versions */
#define RELEASE "7.0.3" #define RELEASE "7.0.3"
#define APILIB "7.0.3 0x231024" #define APICTB "7.0.3 0x231107"
#define APIRECEIVER "7.0.3 0x231024" #define APIGOTTHARD "7.0.3 0x231107"
#define APICTB "7.0.3 0x231107"
#define APIGOTTHARD "7.0.3 0x231107"
#define APIGOTTHARD2 "7.0.3 0x231107" #define APIGOTTHARD2 "7.0.3 0x231107"
#define APIJUNGFRAU "7.0.3 0x231107" #define APIJUNGFRAU "7.0.3 0x231107"
#define APIMYTHEN3 "7.0.3 0x231107" #define APIMYTHEN3 "7.0.3 0x231107"
#define APIMOENCH "7.0.3 0x231107" #define APIMOENCH "7.0.3 0x231107"
#define APIEIGER "7.0.3 0x231107" #define APIEIGER "7.0.3 0x231107"
#define APILIB "7.0.3 0x231108"
#define APIRECEIVER "7.0.3 0x231108"