detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 03:20:42 +02:00
Code Issues Actions Packages Releases Activity

changed the receiver to be the one deciding the frame factor, not gui

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@579 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-27 09:34:24 +00:00
parent 45c690084b
commit b19fdaa0a5
7 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x577 //#define SVNREV 0x578
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x577 #define SVNREV 0x578
#define SVNDATE 0x20130527 #define SVNDATE 0x20130527
// //

4
slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x577 //#define SVNREV 0x578
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x577 #define SVNREV 0x578
#define SVNDATE 0x20130527 #define SVNDATE 0x20130527
// //

4
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x577 //#define SVNREV 0x578
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x577 #define SVNREV 0x578
#define SVNDATE 0x20130527 #define SVNDATE 0x20130527
// //

4
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x577 //#define SVNREV 0x578
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x577 #define SVNREVLIB 0x578
#define SVNDATELIB 0x20130527 #define SVNDATELIB 0x20130527
// //

7
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -413,6 +413,7 @@ int slsReceiverFunctionList::startWriting(){
char *wbuf; char *wbuf;
int sleepnumber=0; int sleepnumber=0;
int frameFactor=0;
framesInFile=0; framesInFile=0;
framesCaught=0; framesCaught=0;
@ -520,7 +521,10 @@ int slsReceiverFunctionList::startWriting(){
//reads every nth frame //reads every nth frame
else{ else{
if(frameFactor){
frameFactor--;
}else{
frameFactor = nFrameToGui-1;
//catch nth frame: gui ready to copy data //catch nth frame: gui ready to copy data
while(guiData==NULL){ while(guiData==NULL){
if(!listening_thread_running) if(!listening_thread_running)
@ -542,6 +546,7 @@ int slsReceiverFunctionList::startWriting(){
} }
guiDataReady=0; guiDataReady=0;
} }
}
framesInFile++; framesInFile++;

4
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -1251,6 +1251,10 @@ int slsReceiverFuncs::set_read_frequency(){
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP); sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL; ret=FAIL;
} }
else if((slsReceiverList->getStatus()==RUNNING) && (index >= 0)){
ret = FAIL;
strcpy(mess,"cannot set up receiver mode when receiver is running\n");
}
else else
retval=slsReceiverList->setNFrameToGui(index); retval=slsReceiverList->setNFrameToGui(index);
} }

4
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x577 //#define SVNREV 0x578
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x577 #define SVNREV 0x578
#define SVNDATE 0x20130527 #define SVNDATE 0x20130527
// //