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

gui svninfo added to script

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@123 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-12-14 13:45:38 +00:00
parent 4ccb47203e
commit adc52782f8
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/include/qDefs.h
View File

@ -21,7 +21,7 @@ public:
qDefs(){}; qDefs(){};
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
#define GUI_VERSION 0.14 static const int64_t GUI_VERSION=0x20121213;
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------

2
slsDetectorGui/slsDetectorGui.pro
View File

@ -22,7 +22,7 @@ CONFIG += debug no_include_pwd
QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w
DEFINES += VERBOSE DACS_INT #VERYVERBOSE DEFINES += VERBOSE DACS_INT THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE
target.path += $(DESTDIR) target.path += $(DESTDIR)

8
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -19,6 +19,7 @@
#include "slsDetector.h" #include "slsDetector.h"
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "svnInfo.h"
// Qt Include Headers // Qt Include Headers
#include <QSizePolicy> #include <QSizePolicy>
#include <QFileDialog> #include <QFileDialog>
@ -531,11 +532,16 @@ void qDetectorMain::ExecuteHelp(QAction *action){
cout << "About: Common GUI for Mythen, Eiger, Gotthard and Agipd detectors" << endl; cout << "About: Common GUI for Mythen, Eiger, Gotthard and Agipd detectors" << endl;
#endif #endif
char version[200]; char version[200];
svnInfo* s = new svnInfo(string(THIS_PATH));
sprintf(version,"%llx",(qDefs::GUI_VERSION<<32) | (s->getRevision()));
string thisGUIVersion = string(version);
sprintf(version,"%llx",myDet->getId(slsDetectorDefs::THIS_SOFTWARE_VERSION)); sprintf(version,"%llx",myDet->getId(slsDetectorDefs::THIS_SOFTWARE_VERSION));
string thisClientVersion = string(version); string thisClientVersion = string(version);
//<h1 style="font-family:verdana;">A heading</h1> //<h1 style="font-family:verdana;">A heading</h1>
qDefs::Message(qDefs::INFORMATION,"<p style=\"font-family:verdana;\">" qDefs::Message(qDefs::INFORMATION,"<p style=\"font-family:verdana;\">"
"SLS Detector GUI version: " + string(QString("%1").arg(GUI_VERSION).toAscii().constData())+"<br>" "SLS Detector GUI version:&nbsp;&nbsp;&nbsp;" + thisGUIVersion+"<br>"
"SLS Detector Client version: "+thisClientVersion+"<br><br>" "SLS Detector Client version: "+thisClientVersion+"<br><br>"
"Common GUI to control the SLS Detectors: " "Common GUI to control the SLS Detectors: "
"Mythen, Eiger, Gotthard and Agipd.<br><br>" "Mythen, Eiger, Gotthard and Agipd.<br><br>"