mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-13 21:37:13 +02:00
fixed zmin zmax bug, automatically online when refreshing advanced tab bug, outdir not checking properly
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@178 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -166,6 +166,7 @@ void qTabDataOutput::setOutputDir(){
|
||||
for(int i=0;i<myDet->getNumberOfDetectors();i++){
|
||||
slsDetector *det = myDet->getSlsDetector(i);
|
||||
qDefs::checkErrorMessage(myDet);
|
||||
oldPath = det->getFilePath();
|
||||
det->setFilePath(string(path.toAscii().constData()));
|
||||
qDefs::checkErrorMessage(det);
|
||||
if(det->getFilePath()!=(string(path.toAscii().constData()))){
|
||||
@ -187,9 +188,20 @@ void qTabDataOutput::setOutputDir(){
|
||||
myDet->setFilePath(string(path.toAscii().constData()));
|
||||
}
|
||||
else {
|
||||
myDet->setFilePath(string(path.toAscii().constData()));
|
||||
for(int i=0;i<myDet->getNumberOfDetectors();i++){
|
||||
slsDetector *det = myDet->getSlsDetector(i);
|
||||
qDefs::checkErrorMessage(myDet);
|
||||
det->setFilePath(string(path.toAscii().constData()));
|
||||
qDefs::checkErrorMessage(det);
|
||||
if(det->getFilePath()!=(string(path.toAscii().constData()))){
|
||||
error=true;
|
||||
qDefs::checkErrorMessage(det);
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* myDet->setFilePath(string(path.toAscii().constData()));
|
||||
if(myDet->getFilePath()!=(string(path.toAscii().constData())))
|
||||
error=true;
|
||||
error=true;*/
|
||||
}
|
||||
|
||||
if(!error){
|
||||
|
Reference in New Issue
Block a user