Changes in src/UIElements/Qt4/Query/StringQtQuery.cpp [94d5ac6:dbf6c7]

File:

• src/UIElements/Qt4/Query/StringQtQuery.cpp (modified) (3 diffs)

src/UIElements/Qt4/Query/StringQtQuery.cpp

@@ -36 +36 @@
 #include <Qt/qlabel.h>
 #include <Qt/qlineedit.h>
+#include <Qt/qcombobox.h>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -52 +53 @@
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
-  inputBox = new QLineEdit();
   parent->addLayout(thisLayout);
   thisLayout->addWidget(titleLabel);
-  thisLayout->addWidget(inputBox);
 
-  onUpdate(inputBox->text());
-  connect(inputBox,SIGNAL(textChanged(const QString&)),this,SLOT(onUpdate(const QString&)));
+
+
+  if (dynamic_cast<DiscreteValidator<std::string>*>(&_param.getValidator()) != NULL){
+    // Discrete set of valid string -> use a ComboBox.
+
+    const std::vector<std::string> &strings = dynamic_cast<DiscreteValidator<std::string>*>(&_param.getValidator())->getValidValues();
+    comboBox = new QComboBox();
+    for(vector<std::string>::const_iterator iter  = strings.begin();
+        iter != strings.end();
+        ++iter) {
+      comboBox->addItem(QString((*iter).c_str()));
+    }
+    thisLayout->addWidget(comboBox);
+
+    connect(comboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(onUpdateCombo(int)));
+    onUpdateCombo(0);
+  }else{
+    // Use a LineEdit.
+    inputBox = new QLineEdit();
+    thisLayout->addWidget(inputBox);
+
+    onUpdate(inputBox->text());
+    connect(inputBox,SIGNAL(textChanged(const QString&)),this,SLOT(onUpdate(const QString&)));
+  }
 }
 
@@ -70 +91 @@
 }
 
+void QtDialog::StringQtQuery::onUpdateCombo(int newIndex) {
+  temp = comboBox->itemText(newIndex).toStdString();
+  dialog->update();
+}
+