detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into mysocket

Browse Source
This commit is contained in:
Erik Frojdh
2019-05-27 09:12:10 +02:00
parent a11fc31c49 e2ef043e04
commit 0972b803dd
36 changed files with 670 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsSupportLib/include/CmdLineParser.h
View File

@ -6,18 +6,17 @@
class CmdLineParser {
public:
void Parse(int argc, char *argv[]);
void Parse(int argc, const char * const argv[]);
void Parse(const std::string &s);
void Print();
//getters
int multi_id() const { return multi_id_; };
int detector_id() const { return detector_id_; };
int n_arguments() const { return arguments_.size(); }
const std::string &command() const { return command_; }
const std::string &executable() const { return executable_; }
const std::vector<std::string> &arguments() const { return arguments_; };
std::vector<char *> argv();
std::vector<const char *> argv() const;
private:
void DecodeIdAndPosition(const char *c);

5
slsSupportLib/include/versionAPI.h
View File

@ -2,9 +2,10 @@
#define GITBRANCH "refgui"
#define APIGOTTHARD 0x190108
#define APIMOENCH 0x181108
#define APIJUNGFRAU 0x190405
#define APILIB 0x190405
#define APIRECEIVER 0x190405
#define APIGUI 0x190405
#define APICTB 0x190514
#define APIEIGER 0x190516
#define APICTB 0x190516
#define APIJUNGFRAU 0x190517