Small change in the receiver concerning the data to the GUI

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@483 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2013-03-06 10:00:40 +00:00
parent bf429705bf
commit 217f63b701

View File

@ -493,23 +493,28 @@ int slsReceiverFunctionList::startWriting(){
totalFramesCaught++;
//currframenum = (int)(*((int*)dataWriteFrame->buffer));
currframenum = (int)(*((int*)wbuf));
if(guiRequiresData)
if(guiRequiresData) {
guiData=latestData;
else
} else {
guiData=NULL;
}
if(enableFileWrite){
if (writeReceiverData)
if (writeReceiverData) {
writeReceiverData(wbuf,bufferSize, sfilefd, pwriteReceiverDataArg);
}
if (cbAction<2) {
rawDataReadyCallBack(currframenum, wbuf,sfilefd, guiData,pRawDataReady);
} else {
fwrite(wbuf, 1, bufferSize, sfilefd);
}
}
if(guiRequiresData){
memcpy(latestData,wbuf,bufferSize);
if (cbAction>=2)
memcpy(latestData,wbuf,bufferSize);
//memcpy(latestData,wbuf,bufferSize);
guiRequiresData=0;
}
//cout<<"write index:"<<(int)(*(int*)latestData)<<endl;