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

fixed advanced tab, optimize settings, threshold and exposure time enabling, histogram plotting crashing

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@68 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-09-25 07:22:04 +00:00
parent 197de5c995
commit a79c5c6183
6 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -353,17 +353,17 @@ void qTabAdvanced::StartTrimming(){
//execute
int ret = myDet->executeTrimming(trimmingMode,parameter1,parameter2,-1);
if((ret!=slsDetectorDefs::FAIL)&&(ret!=-1));
else
qDefs::Message(qDefs::WARNING,"Atleast 1 channel could not be trimmed.","Advanced");
//save trim file
ret = myDet->saveSettingsFile(string(dispFile->text().toAscii().constData()),-1);
if((ret!=slsDetectorDefs::FAIL)&&(ret!=-1)){
//save trim file
ret = myDet->saveSettingsFile(string(dispFile->text().toAscii().constData()),-1);
if((ret!=slsDetectorDefs::FAIL)&&(ret!=-1))
qDefs::Message(qDefs::INFORMATION,"The Trimbits have been saved successfully.","Advanced");
else qDefs::Message(qDefs::WARNING,string("Could not Save the Trimbits to file:\n")+dispFile->text().toAscii().constData(),"Advanced");
qDefs::Message(qDefs::INFORMATION,"The Trimbits have been saved successfully.","Advanced");
//updates plots
myPlot->UpdateTrimbitPlot(false,radioHistogram->isChecked());
}
else
qDefs::Message(qDefs::WARNING,"Atleast 1 channel could not be trimmed.","Advanced");
else qDefs::Message(qDefs::WARNING,string("Could not Save the Trimbits to file:\n")+dispFile->text().toAscii().constData(),"Advanced");
}
@ -371,10 +371,12 @@ void qTabAdvanced::StartTrimming(){
void qTabAdvanced::UpdateTrimbitPlot(int id){
//refresh
if(!id) myPlot->UpdateTrimbitPlot(false,radioHistogram->isChecked());
//from detector
else myPlot->UpdateTrimbitPlot(true,radioHistogram->isChecked());
if(boxPlot->isChecked()){
//refresh
if(!id) myPlot->UpdateTrimbitPlot(false,radioHistogram->isChecked());
//from detector
else myPlot->UpdateTrimbitPlot(true,radioHistogram->isChecked());
}
}