diff --git a/slsDetectorGui/include/svnInfoGui.h b/slsDetectorGui/include/svnInfoGui.h index 51d774730..0d9386e1e 100644 --- a/slsDetectorGui/include/svnInfoGui.h +++ b/slsDetectorGui/include/svnInfoGui.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" //#define SVNREPPATH "" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" -//#define SVNREV 0x123 +//#define SVNREV 0x124 //#define SVNKIND "" //#define SVNSCHED "" -#define SVNAUTH "l_maliakal_d" -#define SVNREV 0x123 -#define SVNDATE 0x20121214 +#define SVNAUTH "bergamaschi" +#define SVNREV 0x124 +#define SVNDATE 0x20121217 // diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index b6af48bb0..daad3e1c3 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -19,7 +19,7 @@ #include "slsDetector.h" #include "multiSlsDetector.h" #include "sls_detector_defs.h" -#include "svnInfo.h" +#include "svnInfoGui.h" // Qt Include Headers #include #include @@ -97,7 +97,7 @@ void qDetectorMain::SetUpWidgetWindow(){ //tabs setup tabs = new MyTabWidget(this); - layoutTabs->addWidget(tabs); cout<<"DockPlot ready"<addWidget(tabs); // creating all the other tab widgets tab_measurement = new qTabMeasurement (this, myDet,myPlot); cout<<"Measurement ready"<getRevision())); + int64_t retval= SVNREV; + retval= (retval <<32) | SVNDATE; + sprintf(version,"%llx",retval); string thisGUIVersion = string(version); sprintf(version,"%llx",myDet->getId(slsDetectorDefs::THIS_SOFTWARE_VERSION));