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

guiDataReady introduced so that both tcp and writing thread handshakes properly with their own variables

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@486 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-03-07 16:49:47 +00:00
parent 91e5e35c73
commit bb5ae3d2ab
5 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -173,8 +173,10 @@ public:
/**
* Returns the buffer-current frame read by receiver
* @param c pointer to current file name
* @param raw address of pointer, pointing to current frame to send to gui
*/
char* readFrame(char* c);
void readFrame(char* c,char** raw);
/**
* Set short frame
@ -283,8 +285,14 @@ private:
/** number of packets per frame*/
int packetsPerFrame;
/** gui wants data */
int guiRequiresData;
/** gui data ready */
int guiDataReady;
/** points to the data to send to gui */
char* guiData;
/** points to the filename to send to gui */
char* guiFileName;
/** current frame number */
int currframenum;
@ -306,8 +314,6 @@ private:
2 we open, close, write file, callback does not do anything
*/
int (*startAcquisitionCallBack)(char*, char*,int, int, void*);
void *pStartAcquisition;
@ -316,8 +322,6 @@ private:
total frames caught
*/
void (*acquisitionFinishedCallBack)(int, void*);
void *pAcquisitionFinished;
@ -329,12 +333,13 @@ private:
file descriptor
guidatapointer (NULL, no data required)
*/
void (*rawDataReadyCallBack)(int, char*, FILE*, char*, void*);
void *pRawDataReady;
/** The action which decides what the user and default responsibilites to save data are
* 0 raw data ready callback takes care of open,close,write file
* 1 callback writes file, we have to open, close it
* 2 we open, close, write file, callback does not do anything */
int cbAction;
public:
@ -344,11 +349,6 @@ public:
/** if the listening thread is running*/
static int listening_thread_running;
// dataStruct *dataWriteFrame;
/**
callback arguments are
filepath
@ -362,7 +362,6 @@ public:
2 we open, close, write file, callback does not do anything
*/
void registerCallBackStartAcquisition(int (*func)(char*, char*,int, int, void*),void *arg){startAcquisitionCallBack=func; pStartAcquisition=arg;};
@ -371,8 +370,6 @@ public:
toatal frames caught
*/
int registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg){acquisitionFinishedCallBack=func; pAcquisitionFinished=arg;};
@ -384,18 +381,11 @@ public:
file descriptor
guidatapointer (NULL, no data required)
*/
int registerCallBackRawDataReady(void (*func)(int, char*, FILE*, char*, void*),void *arg){rawDataReadyCallBack=func; pRawDataReady=arg;};
};