From 5d52e41e37df4165673ed9c2a7ad34b3ace7576e Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 24 Aug 2016 17:10:07 +0200 Subject: [PATCH] adcs refresh only in developer tab --- slsDetectorGui/include/qDetectorMain.h | 2 ++ slsDetectorGui/include/qTabDeveloper.h | 6 +++++- slsDetectorGui/src/qDetectorMain.cpp | 8 ++++++++ slsDetectorGui/src/qTabDeveloper.cpp | 9 +++++++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h index 8833836f4..7574380f5 100644 --- a/slsDetectorGui/include/qDetectorMain.h +++ b/slsDetectorGui/include/qDetectorMain.h @@ -83,6 +83,8 @@ public: /** Verifies if output directories for all the receivers exist */ int DoesOutputDirExist(){return tab_dataoutput->VerifyOutputDirectory();}; + bool isCurrentlyTabDeveloper(); + private: /** The Qt Application */ QApplication *theApp; diff --git a/slsDetectorGui/include/qTabDeveloper.h b/slsDetectorGui/include/qTabDeveloper.h index 75f32eefb..2131a04e2 100644 --- a/slsDetectorGui/include/qTabDeveloper.h +++ b/slsDetectorGui/include/qTabDeveloper.h @@ -24,6 +24,8 @@ class multiSlsDetector; #include #include #include +class qDetectorMain; + /** C++ Include Headers */ #include #include @@ -62,7 +64,7 @@ public: * @param parent is the parent tab widget * @param detector is the detector returned from the detector tab */ - qTabDeveloper(QWidget *parent,multiSlsDetector*& detector); + qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector); /** Destructor */ @@ -73,6 +75,8 @@ public: void StopADCTimer(){if(adcTimer) adcTimer->stop();}; private: + /** parent widget */ + qDetectorMain *thisParent; /** The sls detector object */ multiSlsDetector *myDet; /** The sls detector object */ diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index c3d39928b..1facae787 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -878,4 +878,12 @@ void qDetectorMain::UncheckServer(){ } +//------------------------------------------------------------------------------------------------------------------------------------------------- + + +bool qDetectorMain::isCurrentlyTabDeveloper(){ + return (tabs->currentIndex()==Developer); +} + + //------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index 365bf258e..d6d8a6d28 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -5,6 +5,7 @@ * Author: l_maliakal_d */ #include "qTabDeveloper.h" +#include "qDetectorMain.h" //Project Class Headers #include "slsDetector.h" #include "multiSlsDetector.h" @@ -24,8 +25,8 @@ int qTabDeveloper::NUM_ADC_WIDGETS(0); //------------------------------------------------------------------------------------------------------------------------------------------------- -qTabDeveloper::qTabDeveloper(QWidget *parent,multiSlsDetector*& detector): - QWidget(parent), +qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector): + thisParent(parent), myDet(detector), det(0), boxDacs(0), @@ -52,6 +53,7 @@ qTabDeveloper::qTabDeveloper(QWidget *parent,multiSlsDetector*& detector): qTabDeveloper::~qTabDeveloper(){ delete myDet; if(det) delete det; + if(thisParent) delete thisParent; } @@ -523,6 +525,9 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){ void qTabDeveloper::RefreshAdcs(){ + if(!thisParent->isCurrentlyTabDeveloper()) + return; + #ifdef VERYVERBOSE cout << "Updating ADCs" <