From dc8f67cd7b7f689cfacfd20075da2c9b157ad1b3 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 20 May 2020 12:04:48 +0200 Subject: [PATCH] gui fix --- slsDetectorGui/include/qDefs.h | 1 + slsDetectorGui/include/qTabMeasurement.h | 1 + slsDetectorGui/src/qTabMeasurement.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index c0b7ab766..20a468b8b 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -1,5 +1,6 @@ #pragma once +#include "logger.h" #include "sls_detector_defs.h" #include diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index 1d19860dd..b38148188 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -25,6 +25,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject { void SetNumTriggers(int val); void SetNumBursts(int val); void SetNumSamples(int val); + void SetNumGates(int val); void SetExposureTime(); void SetAcquisitionPeriod(); void SetDelay(); diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index e61efe63f..46f48136a 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -197,11 +197,11 @@ void qTabMeasurement::SetupTimingMode() { item[(int)BURST_TRIGGER]->setEnabled(false); item[(int)TRIGGER_GATED]->setEnabled(false); switch (det->getDetectorType().squash()) { - case EIGER: + case slsDetectorDefs::EIGER: item[(int)GATED]->setEnabled(true); item[(int)BURST_TRIGGER]->setEnabled(true); break; - case MYTHEN3: + case slsDetectorDefs::MYTHEN3: item[(int)GATED]->setEnabled(true); item[(int)TRIGGER_GATED]->setEnabled(true); break; @@ -498,8 +498,8 @@ void qTabMeasurement::GetExposureTime() { spinExpTime->setValue(-1); bool inconsistentGateValues = false; - Result retval; - if (det->getDetectorType().squash() == MYTHEN3) { + std::chrono::nanoseconds retval; + if (det->getDetectorType().squash() == slsDetectorDefs::MYTHEN3) { auto retvals = det->getExptimeForAllGates().tsquash( "Inconsistent exposure time for all detectors."); // all gates have same value