From 922c7ede9295f77840faa3729237999f722dc064 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 31 Jan 2014 16:32:31 +0000 Subject: [PATCH] removed an extra settings check git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@254 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/src/qDrawPlot.cpp | 2 +- slsDetectorGui/src/qTabSettings.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 1d3e4703f..d9439899b 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -658,7 +658,7 @@ void qDrawPlot::SetupMeasurement(){ minPixelsY = 0; startPixel = -0.5; endPixel = nPixelsY-0.5; - }else cout<<"correct palce"<getSettings(); - if(sett==-1) sett = slsDetectorDefs::UNDEFINED; - comboSettings->setCurrentIndex(sett); //threshold if((detType == slsDetectorDefs::MYTHEN) || (detType == slsDetectorDefs::EIGER)) @@ -166,7 +163,7 @@ void qTabSettings::setSettings(int index){ else{ slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index); #ifdef VERBOSE - cout << "Settings have been set to " << myDet->slsDetectorBase::getDetectorSettings(sett) << endl; + cout << endl << "Settings have been set to " << myDet->slsDetectorBase::getDetectorSettings(sett) << endl; #endif //threshold