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

fixed the undefined state of gui when acquisition stopped

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@545 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-05-07 14:20:01 +00:00
parent f29358992d
commit 1eae11a87a
10 changed files with 100 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -138,6 +138,8 @@ void slsReceiverFunctionList::setEthernetInterface(char* c){
int slsReceiverFunctionList::getFrameIndex(){
if(startFrameIndex==-1)
frameIndex=0;
else if(myDetectorType == MOENCH)
frameIndex=currframenum - startFrameIndex;
else
frameIndex=(currframenum - startFrameIndex)/packetsPerFrame;
return frameIndex;
@ -148,12 +150,11 @@ int slsReceiverFunctionList::getFrameIndex(){
int slsReceiverFunctionList::getAcquisitionIndex(){
if(startAcquisitionIndex==-1)
acquisitionIndex=0;
else{
if(myDetectorType == MOENCH)
acquisitionIndex=(currframenum - startAcquisitionIndex);
else
else if(myDetectorType == MOENCH)
acquisitionIndex=currframenum - startAcquisitionIndex;
else
acquisitionIndex=(currframenum - startAcquisitionIndex)/packetsPerFrame;
}
return acquisitionIndex;
}
@ -364,8 +365,6 @@ int slsReceiverFunctionList::startListening(){
else
startFrameIndex = ((((int)(*((int*)buffer))) & (frameIndexMask)) >> frameIndexOffset)-1;
//startFrameIndex -= packetsPerFrame;
// startFrameIndex -=1;
//cout<<"startFrameIndex:"<<startFrameIndex<<endl;
prevframenum=startFrameIndex;
}
@ -373,7 +372,7 @@ int slsReceiverFunctionList::startListening(){
//start of acquisition
if(startAcquisitionIndex==-1){
startAcquisitionIndex=startFrameIndex;
currframenum =startAcquisitionIndex;
currframenum = startAcquisitionIndex;
cout<<"startAcquisitionIndex:"<<startAcquisitionIndex<<endl;
}
@ -515,7 +514,7 @@ int slsReceiverFunctionList::startWriting(){
else
currframenum = (((int)(*((int*)wbuf))) & (frameIndexMask)) >> frameIndexOffset;
//currframenum = (int)(*((int*)wbuf));
cout<<"**************curreframenm:"<<currframenum<<endl;
//cout<<"**************curreframenm:"<<currframenum<<endl;
//write data
if(enableFileWrite){