detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 13:01:12 +01:00
Code Issues Actions Packages Releases Activity

possible to use binary --version or -v to get the branch and versionid

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-06 19:05:35 +01:00
parent c4a242e10a
commit bf9905ad2a
10 changed files with 130 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/include/gitInfoGui.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
#define GITREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
#define GITREPUUID "c4a242e10a4aafd102cc9a2a7ddae4ac92b8ba99"
#define GITAUTH "Dhanya_Maliakal"
#define GITREV 0x3185
#define GITREV 0x3187
#define GITDATE 0x20171206
#define GITBRANCH "blabla"
#define GITBRANCH "3.0.1"

5
slsDetectorGui/include/qDetectorMain.h
View File

@@ -55,10 +55,11 @@ public:
* This is mainly used to create detector object and all the tabs
* @param argc number of command line arguments for server options
* @param argv server options
* @param app the qapplication
* @param app the qapplication3
* @param ret OK or FAIL of constructor (from command line arguments)
* @param parent makes the parent window 0 by default
* */
qDetectorMain(int argc, char **argv, QApplication *app, QWidget *parent = 0);
qDetectorMain(int argc, char **argv, QApplication *app, int& ret, QWidget *parent = 0);
/**Destructor
* */