Merge pull request #2506 from NREL/measure_issues

Fixes #2418
NREL · Mar 3, 2017 · f28afa0 · f28afa0 · nrel-bot-3 · Mar 3, 2017
2 parents 6fa63dc + 24c2303
commit f28afa0
Showing 1 changed file with 30 additions and 3 deletions.
diff --git a/openstudiocore/src/shared_gui_components/EditController.cpp b/openstudiocore/src/shared_gui_components/EditController.cpp
@@ -201,28 +201,55 @@ InputController::InputController(EditController * editController,const measure::
     {
       choiceInputView->comboBox->insertItem(0,"");
     }
-    else if( choiceInputView->comboBox->findText(QString::fromStdString(m_argument.defaultValueAsString())) == -1 )
+    else
     {
-      choiceInputView->comboBox->insertItem(0,"");
+      int index = choiceInputView->comboBox->findData(QString::fromStdString(m_argument.defaultValueAsString()));
+
+      if (index == -1){
+        index = choiceInputView->comboBox->findText(QString::fromStdString(m_argument.defaultValueAsString()));
+      }
+
+      if (index == -1)
+      {
+        // DLM: this is an error
+        choiceInputView->comboBox->insertItem(0, "");
+      }
     }
 
     // Set the initial value
     if( m_argument.hasValue() )
     {
       int index = choiceInputView->comboBox->findData(QString::fromStdString(m_argument.valueAsString()));
 
-      choiceInputView->comboBox->setCurrentIndex(index);
+      if (index == -1){
+        index = choiceInputView->comboBox->findText(QString::fromStdString(m_argument.valueAsString()));
+      }
+
+      if( index != -1 )
+      {
+        choiceInputView->comboBox->setCurrentIndex(index);
+      }
+      else
+      {
+        // DLM: this is an error
+        choiceInputView->comboBox->setCurrentIndex(0);
+      }
     }
     else if( m_argument.hasDefaultValue() )
     {
       int index = choiceInputView->comboBox->findData(QString::fromStdString(m_argument.defaultValueAsString()));
 
+      if (index == -1){
+        index = choiceInputView->comboBox->findText(QString::fromStdString(m_argument.defaultValueAsString()));
+      }
+
       if( index != -1 )
       {
         choiceInputView->comboBox->setCurrentIndex(index);
       }
       else
       {
+        // DLM: this is an error
         choiceInputView->comboBox->setCurrentIndex(0);
       }
     }