detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

included the revision change

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@125 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-12-17 16:39:25 +00:00
parent 5bb8bc4574
commit 46a4fee083
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/include/svnInfoGui.h
View File

@ -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
//

9
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -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 <QSizePolicy>
#include <QFileDialog>
@ -97,7 +97,7 @@ void qDetectorMain::SetUpWidgetWindow(){
//tabs setup
tabs = new MyTabWidget(this);
layoutTabs->addWidget(tabs); cout<<"DockPlot ready"<<endl;
layoutTabs->addWidget(tabs);
// creating all the other tab widgets
tab_measurement = new qTabMeasurement (this, myDet,myPlot); cout<<"Measurement ready"<<endl;
@ -532,8 +532,9 @@ void qDetectorMain::ExecuteHelp(QAction *action){
cout << "About: Common GUI for Mythen, Eiger, Gotthard and Agipd detectors" << endl;
#endif
char version[200];
svnInfo* s = new svnInfo(string(THIS_PATH));
sprintf(version,"%llx",(qDefs::GUI_VERSION<<32) | (s->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));