From f1a77c4146245c652c3b7b890e9ac50493ec8813 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 11 Jul 2017 13:27:27 +0200
Subject: [PATCH] resolved issue with source not being looked at for compiling

---
 slsDetectorGui/Makefile                | 4 ++--
 slsDetectorGui/gitInfo.txt             | 8 ++++----
 slsDetectorGui/include/gitInfoGui.h    | 8 ++++----
 slsDetectorGui/include/qTabDeveloper.h | 2 --
 slsDetectorGui/src/qTabDeveloper.cpp   | 7 +++----
 slsDetectorGui/updateGitVersion.sh     | 2 --
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index a49841d5a..90ca37a00 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -39,7 +39,7 @@ lib:
 
 
 clean: 
-	if test -e Makefile.gui; then $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; 	rm Makefile.gui; else 	$(MAKE) Makefile.gui; 	$(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean;  fi
+	if test -e Makefile.gui; then $(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean; 	rm Makefile.gui; rm $(DESTDIR)/slsDetectorGui; else 	$(MAKE) Makefile.gui; 	$(MAKE) -f Makefile.gui clean; $(MAKE) -f Makefile.gui mocclean;  rm $(DESTDIR)/slsDetectorGui; fi
 	cd client &&  $(MAKE) clean
 #	cd manual && make clean
 
@@ -55,7 +55,7 @@ doc:
 htmldoc:
 	cd manual && $(MAKE) html DESTDIR=$(DOCDIR)
 
-$(PROG): Makefile $(DIR)
+$(PROG): Makefile $(DIR) src/*.cpp  include/*.h slsDetectorPlotting/include/*.h slsDetectorPlotting/src/*.cxx  forms/include/*.h
 	$(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
 
 guiclient:
diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt
index 02a6142ce..2d55ec180 100644
--- a/slsDetectorGui/gitInfo.txt
+++ b/slsDetectorGui/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
-Repsitory UUID: 082fbe9d8d959d49d7dd10907e3ac10007154dc6 
-Revision: 402 
+Repsitory UUID: 4a4fcb049bd7ac2837af6de34598a13fab67b1e7 
+Revision: 404 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 402 
-Last Changed Date: 2017-07-07 14:32:51.000000002 +0200 ./Makefile.gui
+Last Changed Rev: 404 
+Last Changed Date: 2017-07-11 11:46:42.000000002 +0200 ./Makefile.gui
diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h
index ad0bc1c68..38d1a1209 100644
--- a/slsDetectorGui/include/gitInfoGui.h
+++ b/slsDetectorGui/include/gitInfoGui.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "082fbe9d8d959d49d7dd10907e3ac10007154dc6"
-//#define SVNREV 0x402
+#define SVNREPUUID "4a4fcb049bd7ac2837af6de34598a13fab67b1e7"
+//#define SVNREV 0x404
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x402
-#define SVNDATE 0x20170707
+#define SVNREV 0x404
+#define SVNDATE 0x20170711
 //
diff --git a/slsDetectorGui/include/qTabDeveloper.h b/slsDetectorGui/include/qTabDeveloper.h
index dfa3868f3..c37e18b77 100644
--- a/slsDetectorGui/include/qTabDeveloper.h
+++ b/slsDetectorGui/include/qTabDeveloper.h
@@ -10,7 +10,6 @@
 
 #include "qDefs.h"
 
-
 /** Project Class Headers */
 class multiSlsDetector;
 /** Qt Include Headers */
@@ -52,7 +51,6 @@ private:
 };
 
 
-
 /**
  *@short sets up the Developer parameters
  */
diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp
index 3c756b570..655e3d950 100644
--- a/slsDetectorGui/src/qTabDeveloper.cpp
+++ b/slsDetectorGui/src/qTabDeveloper.cpp
@@ -15,6 +15,7 @@
 #include <QDoubleValidator>
 //C++ Include Headers
 #include<iostream>
+
 using namespace std;
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25,7 +26,7 @@ int qTabDeveloper::NUM_ADC_WIDGETS(0);
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
 
-qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector) :
+qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector):
 								thisParent(parent),
 								myDet(detector),
 								det(0),
@@ -35,7 +36,7 @@ qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector)
 								comboHV(0),
 								adcTimer(0),
 								dacLayout(0){
-	for(int i=0;i<20;i++){
+	for(int i=0;i<20;i++) {
 		lblDacs[i]=0;
 		lblAdcs[i]=0;
 		spinDacs[i]=0;
@@ -630,5 +631,3 @@ void qTabDeveloper::Refresh(){
 
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------
-
-
diff --git a/slsDetectorGui/updateGitVersion.sh b/slsDetectorGui/updateGitVersion.sh
index da7ad9e7d..7a428fe84 100755
--- a/slsDetectorGui/updateGitVersion.sh
+++ b/slsDetectorGui/updateGitVersion.sh
@@ -17,8 +17,6 @@ NEWDATE=${NEWDATE/#/0x}
 
 #get old date from INCLFILE
 OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
-echo $OLDDATE
-echo $NEWDATE
 #update INCLFILE if changes
 if [ "$OLDDATE" != "$NEWDATE" ]; then
 	echo Path: ${MAINDIR}/${SPECDIR}  $'\n'URL: ${GITREPO}  $'\n'Repository Root: ${GITREPO}  $'\n'Repsitory UUID: ${REPUID}  $'\n'Revision: ${FOLDERREV}  $'\n'Branch: ${BRANCH}  $'\n'Last Changed Author: ${AUTH1}_${AUTH2}  $'\n'Last Changed Rev: ${REV}  $'\n'Last Changed Date: ${RDATE} > gitInfo.txt