Merge branch 'developer' into gui

This commit is contained in:
2019-06-25 09:08:29 +02:00
11 changed files with 71 additions and 368 deletions

View File

@@ -4,7 +4,7 @@
#include "sls_detector_defs.h"
#include <vector>
class multiSlsDetector;
@@ -31,6 +31,9 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
*/
std::string executeLine(int narg, const char * const args[], int action, int detPos = -1);
std::vector<std::string> getAllCommands();
/* /\** */
/* returns the help for the executeLine command */
/* \param os output stream to return the help to */