From 5c63c8fc8ff13627363fb647cb19179139c21e49 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 13 Jun 2019 09:01:39 +0200 Subject: [PATCH] gui bug fix: switching to tab plot while acquiring produced error messages --- RELEASE.txt | 11 +++++++++-- slsDetectorGui/gitInfo.txt | 8 ++++---- slsDetectorGui/include/gitInfoGui.h | 6 +++--- slsDetectorSoftware/gitInfo.txt | 8 ++++---- slsDetectorSoftware/slsDetector/gitInfoLib.h | 6 +++--- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index fade41e62..f9b28e627 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,4 +1,4 @@ -SLS Detector Package 4.0.2 released on 12.06.2019 (Bug Fix Release) +SLS Detector Package 4.0.2 released on 13.06.2019 (Bug Fix Release) =================================================================== @@ -23,6 +23,7 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. - Gotthard server get settings does not set default dacs anymore - Client API data call back / Gui (Eiger in 4 bit mode) - Users class added burst_trigger in getTimingMode from string + - Gui switching to tabplot during acquisition error messages 2. Resolved Issues @@ -41,7 +42,7 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. Detector Server - -------------------------- + --------------- 1. (Jungfrau) Switching between different detector size configurations with same detector modules, the detector gave an error "Could not set detector position". This is fixed now. @@ -61,6 +62,12 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. 2. Added "burst_trigger" in getTimingMode (from string to int) in Users class. + Gui + --- + 1. Switching to Tab Plot during acquisition produced error messages. This has been + fixed. + + 3. Known Issues =============== diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index eee105d5d..fdf5d1d90 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 46533b041195591b1a09b2662895e084821ba886 -Revision: 525 +Repsitory UUID: 7b70274d4f57977649e4f4a69c21238f335561fc +Revision: 527 Branch: 4.0.2 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4107 -Last Changed Date: 2019-06-12 14:40:26.000000002 +0200 ./src/qTabSettings.cpp +Last Changed Rev: 4109 +Last Changed Date: 2019-06-13 08:55:33.000000002 +0200 ./src/qTabMeasurement.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index a817c64c5..39be4e516 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "46533b041195591b1a09b2662895e084821ba886" +#define GITREPUUID "7b70274d4f57977649e4f4a69c21238f335561fc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4107 -#define GITDATE 0x20190612 +#define GITREV 0x4109 +#define GITDATE 0x20190613 #define GITBRANCH "4.0.2" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index b4f09c533..80127194c 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 46533b041195591b1a09b2662895e084821ba886 -Revision: 2081 +Repsitory UUID: 7b70274d4f57977649e4f4a69c21238f335561fc +Revision: 2082 Branch: 4.0.2 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4107 -Last Changed Date: 2019-06-12 15:39:35.000000002 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 4109 +Last Changed Date: 2019-06-13 09:00:22.000000002 +0200 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index a817c64c5..39be4e516 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "46533b041195591b1a09b2662895e084821ba886" +#define GITREPUUID "7b70274d4f57977649e4f4a69c21238f335561fc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4107 -#define GITDATE 0x20190612 +#define GITREV 0x4109 +#define GITDATE 0x20190613 #define GITBRANCH "4.0.2"