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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh
2020-09-24 16:55:50 +02:00
parent 671a2724ac 9c5d8cfcd7
commit c862f1df81
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -167,7 +167,7 @@ void qTabMeasurement::ShowTriggerDelay() {
if ((comboBurstMode->currentIndex() == if ((comboBurstMode->currentIndex() ==
slsDetectorDefs::CONTINUOUS_INTERNAL || slsDetectorDefs::CONTINUOUS_INTERNAL ||
comboBurstMode->currentIndex() == comboBurstMode->currentIndex() ==
slsDetectorDefs::CONTINUOUS_INTERNAL) && slsDetectorDefs::CONTINUOUS_EXTERNAL) &&
(comboTimingMode->currentIndex() == TRIGGER)) { (comboTimingMode->currentIndex() == TRIGGER)) {
enableFramePeriod = false; enableFramePeriod = false;
} }