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

check for why gui doesnt show all data

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-25 15:35:00 +02:00
parent f7898bc62b
commit 1e361bb3ba
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5167,7 +5167,7 @@ void multiSlsDetector::startReceivingDataThread(){
//end of socket ("end") //end of socket ("end")
if (len < 1024*256 ) { if (len < 1024*256 ) {
if(len == 3){ if(len == 3){
cprintf(RED,"%d Received end of acquisition\n", ithread); //cprintf(RED,"%d Received end of acquisition\n", ithread);
singleframe[ithread] = NULL; singleframe[ithread] = NULL;
//break; //break;
}else{ }else{
@ -5249,11 +5249,9 @@ void multiSlsDetector::readFrameFromReceiver(){
volatile uint64_t dataThreadMask = 0x0; volatile uint64_t dataThreadMask = 0x0;
cout<<"numreadouts:"<<numReadouts<<endl;
for(int i = 0; i < numReadouts; ++i) for(int i = 0; i < numReadouts; ++i)
dataThreadMask|=(1<<i); dataThreadMask|=(1<<i);
printf("dataThreadMask:%x\n",dataThreadMask);
//construct complete image and send to callback //construct complete image and send to callback
while(true){ while(true){
@ -5277,7 +5275,6 @@ void multiSlsDetector::readFrameFromReceiver(){
//this socket closed //this socket closed
if(singleframe[ireadout] == NULL){ //if got nothing if(singleframe[ireadout] == NULL){ //if got nothing
dataThreadMask^=(1<<ireadout); dataThreadMask^=(1<<ireadout);
printf("dataThreadMask:%x\n",dataThreadMask);
continue; continue;
} }
@ -5331,7 +5328,7 @@ void multiSlsDetector::readFrameFromReceiver(){
dataReady(thisData, currentFrameIndex, currentSubFrameIndex, pCallbackArg);//should be fnum and subfnum from json header dataReady(thisData, currentFrameIndex, currentSubFrameIndex, pCallbackArg);//should be fnum and subfnum from json header
delete thisData; delete thisData;
fdata = NULL; fdata = NULL;
//cout<<"Send frame #"<< currentFrameIndex << " to gui"<<endl; cout<<"Send frame #"<< currentFrameIndex << " to gui"<<endl;
} }
setCurrentProgress(currentAcquisitionIndex+1); setCurrentProgress(currentAcquisitionIndex+1);
} }