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

external gui unused variables

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-24 16:03:31 +02:00
parent fbb04f5ebe
commit e5c84fd11c
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: aab5292e58e0ebf3a425e13254194f780952155a Repsitory UUID: 7eb486427fab1732def525df6fcfad6e34ee4f74
Revision: 1491 Revision: 1539
Branch: 3.0-rc Branch: 3.0
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1496 Last Changed Rev: 1544
Last Changed Date: 2017-08-18 16:08:14.000000002 +0200 ./slsDetector/slsDetector.cpp Last Changed Date: 2017-08-24 14:09:36.000000002 +0200 ./slsDetector/slsDetectorUtils.h

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "aab5292e58e0ebf3a425e13254194f780952155a" #define SVNREPUUIDLIB "7eb486427fab1732def525df6fcfad6e34ee4f74"
//#define SVNREV 0x1496 //#define SVNREV 0x1544
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1496 #define SVNREVLIB 0x1544
#define SVNDATELIB 0x20170818 #define SVNDATELIB 0x20170824
// //

4
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2473,9 +2473,7 @@ string slsDetectorCommand::cmdDataStream(int narg, char *args[], int action) {
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if (!sscanf(args[1],"%d",&ival)) if (!sscanf(args[1],"%d",&ival))
return string ("cannot scan externalgui mode"); return string ("cannot scan externalgui mode");
bool bval=ival>0?true:false; myDet->setExternalGuiFlag(ival>0?true:false);
bool oldval = myDet->getExternalGuiFlag();
myDet->setExternalGuiFlag(bval);
myDet->enableDataStreamingFromReceiver(ival); myDet->enableDataStreamingFromReceiver(ival);
} }