detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-04 20:00:04 +02:00
Code Issues Actions Packages Releases Activity

resolved issue with source not being looked at for compiling

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-07-11 13:27:27 +02:00
parent e0b886e2cc
commit f1a77c4146
6 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/Makefile
View File

@ -39,7 +39,7 @@ lib:
clean: 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 client && $(MAKE) clean
# cd manual && make clean # cd manual && make clean
@ -55,7 +55,7 @@ doc:
htmldoc: htmldoc:
cd manual && $(MAKE) html DESTDIR=$(DOCDIR) 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)' $(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
guiclient: guiclient:

8
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git
Repsitory UUID: 082fbe9d8d959d49d7dd10907e3ac10007154dc6 Repsitory UUID: 4a4fcb049bd7ac2837af6de34598a13fab67b1e7
Revision: 402 Revision: 404
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 402 Last Changed Rev: 404
Last Changed Date: 2017-07-07 14:32:51.000000002 +0200 ./Makefile.gui Last Changed Date: 2017-07-11 11:46:42.000000002 +0200 ./Makefile.gui

8
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "082fbe9d8d959d49d7dd10907e3ac10007154dc6" #define SVNREPUUID "4a4fcb049bd7ac2837af6de34598a13fab67b1e7"
//#define SVNREV 0x402 //#define SVNREV 0x404
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x402 #define SVNREV 0x404
#define SVNDATE 0x20170707 #define SVNDATE 0x20170711
// //

2
slsDetectorGui/include/qTabDeveloper.h
View File

@ -10,7 +10,6 @@
#include "qDefs.h" #include "qDefs.h"
/** Project Class Headers */ /** Project Class Headers */
class multiSlsDetector; class multiSlsDetector;
/** Qt Include Headers */ /** Qt Include Headers */
@ -52,7 +51,6 @@ private:
}; };
/** /**
*@short sets up the Developer parameters *@short sets up the Developer parameters
*/ */

7
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -15,6 +15,7 @@
#include <QDoubleValidator> #include <QDoubleValidator>
//C++ Include Headers //C++ Include Headers
#include<iostream> #include<iostream>
using namespace std; 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), thisParent(parent),
myDet(detector), myDet(detector),
det(0), det(0),
@ -35,7 +36,7 @@ qTabDeveloper::qTabDeveloper(qDetectorMain *parent,multiSlsDetector*& detector)
comboHV(0), comboHV(0),
adcTimer(0), adcTimer(0),
dacLayout(0){ dacLayout(0){
for(int i=0;i<20;i++){ for(int i=0;i<20;i++) {
lblDacs[i]=0; lblDacs[i]=0;
lblAdcs[i]=0; lblAdcs[i]=0;
spinDacs[i]=0; spinDacs[i]=0;
@ -630,5 +631,3 @@ void qTabDeveloper::Refresh(){
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------

2
slsDetectorGui/updateGitVersion.sh
View File

@ -17,8 +17,6 @@ NEWDATE=${NEWDATE/#/0x}
#get old date from INCLFILE #get old date from INCLFILE
OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}') OLDDATE=$(more $INCLFILE | grep '#define SVNDATE' | awk '{print $3}')
echo $OLDDATE
echo $NEWDATE
#update INCLFILE if changes #update INCLFILE if changes
if [ "$OLDDATE" != "$NEWDATE" ]; then 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 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