From 6ad6c9e8bbb82395519b6834e1d4fe74eb899a77 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 15 Mar 2016 16:10:10 +0100
Subject: [PATCH] fixed undefined gain enum to a large number

---
 slsDetectorGui/src/qTabSettings.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp
index d5b181dad..6fdd12c5a 100644
--- a/slsDetectorGui/src/qTabSettings.cpp
+++ b/slsDetectorGui/src/qTabSettings.cpp
@@ -102,7 +102,9 @@ void qTabSettings::SetupDetectorSettings(){
 	// Get detector settings from detector
 	slsDetectorDefs::detectorSettings sett = myDet->getSettings();cout<<"sett:"<<sett<<endl;
 	qDefs::checkErrorMessage(myDet,"qTabSettings::SetupDetectorSettings");
-	if(sett==-1) sett = slsDetectorDefs::UNDEFINED;
+	if(sett==-1) sett = Undefined;
+	else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
+	else if(sett == slsDetectorDefs::UNINITIALIZED) sett = Uninitialized;
 	// To be able to index items on a combo box
 	model = qobject_cast<QStandardItemModel*>(comboSettings->model());
 	if (model) {
@@ -216,7 +218,9 @@ void qTabSettings::setSettings(int index){
 		qDefs::Message(qDefs::WARNING,"Cannot change settings to Undefined or Uninitialized.","qTabSettings::setSettings");
 		disconnect(comboSettings, 		SIGNAL(currentIndexChanged(int)),	this, SLOT(setSettings(int)));
 		int sett = (int)myDet->getSettings();
-		if(sett==-1) sett = slsDetectorDefs::UNDEFINED;
+		if(sett==-1) sett = Undefined;
+		else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
+		else if(sett == slsDetectorDefs::UNINITIALIZED) sett = Uninitialized;
 		comboSettings->setCurrentIndex(sett);
 		connect(comboSettings, 		SIGNAL(currentIndexChanged(int)),	this, SLOT(setSettings(int)));
 	}
@@ -331,7 +335,9 @@ void qTabSettings::Refresh(){
 	cout  << "Getting settings" << endl;
 #endif
 	int sett = (int)myDet->getSettings();
-	if(sett==-1) sett = slsDetectorDefs::UNDEFINED;
+	if(sett==-1) sett = Undefined;//slsDetectorDefs::UNDEFINED;
+	else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
+	else if(sett == slsDetectorDefs::UNINITIALIZED) sett = Uninitialized;
 	comboSettings->setCurrentIndex(sett);