Changeset dbf6c7 for src

Timestamp:

Nov 16, 2012, 11:10:56 AM (12 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

751d6b7

Parents:

dc438c

git-author:

Michael Ankele <ankele@…> (10/23/12 12:00:22)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:56)

Message:

StringQtQuery: ComboBox for discrete values

Location:

src/UIElements/Qt4/Query

Files:

• QtQuery.hpp (modified) (2 diffs)
• StringQtQuery.cpp (modified) (3 diffs)

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -306 +306 @@
 public slots:
   void onUpdate(const QString&);
+  void onUpdateCombo(int index);
 
 private:
@@ -312 +313 @@
   QLabel *titleLabel;
   QLineEdit *inputBox;
+  QComboBox *comboBox;
   Dialog *dialog;
 };

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();
+}
+