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

fixed angular conversion crashing problem and got rid of unnecssary prints

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@253 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2014-01-31 14:12:14 +00:00
parent f738b218e1
commit 78e6dccf46
4 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -404,30 +404,20 @@ void qTabDataOutput::SetAngularCorrection(){
#ifdef VERYVERBOSE
cout << "Entering Set Angular Correction function" << endl;
#endif
if(chkAngular->isChecked()){
if(myDet->setAngularConversionFile("default")){
bool enabled = chkAngular->isChecked();
//set
if(myDet->setAngularCorrectionMask(enabled) == enabled){
#ifdef VERBOSE
cout << "Setting angular conversion to default" << endl;
cout << "Angular Conversion mask:" << enabled << endl;
#endif
}else{
}
//error
else{
#ifdef VERBOSE
cout << "Could not set angular conversion to default" << endl;
#endif
qDefs::Message(qDefs::WARNING,"Angular Conversion could not be set. Please set the default file name using the command line, if you haven't already.","qTabDataOutput::SetAngularCorrection");
chkAngular->setChecked(false);
}
}else{
if(myDet->setAngularConversionFile("")){
#ifdef VERBOSE
cout << "Could not reset angular correction" << endl;
#endif
qDefs::Message(qDefs::WARNING,"Angular Conversion could not be reset.","qTabDataOutput::SetAngularCorrection");
chkAngular->setChecked(true);
}else{;
#ifdef VERBOSE
cout << "Unsetting angular correction" << endl;
#endif
}
qDefs::Message(qDefs::WARNING,"Angular Conversion could not be set/reset. Please set the default file name using the command line, if you want to set it.","qTabDataOutput::SetAngularCorrection");
chkAngular->setChecked(!enabled);
}
emit AngularConversionSignal(chkAngular->isChecked());