detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 10:20:04 +02:00
Code Issues Actions Packages Releases Activity

removed an extra settings check

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@254 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2014-01-31 16:32:31 +00:00
parent 78e6dccf46
commit 922c7ede92
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -658,7 +658,7 @@ void qDrawPlot::SetupMeasurement(){
minPixelsY = 0; minPixelsY = 0;
startPixel = -0.5; startPixel = -0.5;
endPixel = nPixelsY-0.5; endPixel = nPixelsY-0.5;
}else cout<<"correct palce"<<endl; }
} }
else { else {
#ifdef VERYVERBOSE #ifdef VERYVERBOSE

5
slsDetectorGui/src/qTabSettings.cpp
View File

@ -41,9 +41,6 @@ void qTabSettings::SetupWidgetWindow(){
// Settings // Settings
SetupDetectorSettings(); SetupDetectorSettings();
int sett = (int)myDet->getSettings();
if(sett==-1) sett = slsDetectorDefs::UNDEFINED;
comboSettings->setCurrentIndex(sett);
//threshold //threshold
if((detType == slsDetectorDefs::MYTHEN) || (detType == slsDetectorDefs::EIGER)) if((detType == slsDetectorDefs::MYTHEN) || (detType == slsDetectorDefs::EIGER))
@ -166,7 +163,7 @@ void qTabSettings::setSettings(int index){
else{ else{
slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index); slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index);
#ifdef VERBOSE #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 #endif
//threshold //threshold