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

reduced size of file names in gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-08-27 10:44:24 +02:00
parent 2f160a7c28
commit f546814d39
2 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4598,6 +4598,8 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &acquisitionIndex
int *retdet = NULL, *p=retval;
string fullFName="";
string ext="";
int index=-1,f_index=-1,p_index=-1,det_index=-1;
double sv0=-1,sv1=-1;
if(getDetectorsType() == EIGER){
maxX = thisMultiDetector->numberOfChannel[X];
@ -4645,9 +4647,15 @@ int* multiSlsDetector::readFrameFromReceiver(char* fName, int &acquisitionIndex
ext = ext.erase(0,dot);
else
ext = "";
//get variables
fileIOStatic::getVariablesFromFileName(fName,index, f_index, p_index, sv0, sv1, det_index);
fullFName.append(fileIOStatic::getReceiverFileNameToConcatenate(fName));
}
}
fullFName.append(getReceiverFileNameToConcatenate(fName));
if(!fileIOStatic::verifySameFrame(fName,index,f_index, p_index, sv0, sv1, det_index)){
fullFName.append(fileIOStatic::getReceiverFileNameToConcatenate(fName));
}
}
}else {
#ifdef VERBOSE