Changeset e59e8e for src/UIElements/Qt4/Query/QtQueryList.hpp

Timestamp:

Nov 16, 2012, 11:10:57 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:

5b991a

Parents:

713a43

git-author:

Michael Ankele <ankele@…> (11/02/12 15:43:14)

git-committer:

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

Message:

ParserTypeValidator + And_Validator: values readable by QtQueryList

File:

• src/UIElements/Qt4/Query/QtQueryList.hpp (modified) (2 diffs)

src/UIElements/Qt4/Query/QtQueryList.hpp

@@ -18 +18 @@
 #include "Parameters/Parameter.hpp"
 #include "Parameters/Validators/STLVectorValidator.hpp"
+#include "Parameters/Validators/Ops_Validator_impl.hpp"
 
 class QListWidget;
@@ -53 +54 @@
   QtQueryList(Parameter<std::vector<T> > &parentParam, QBoxLayout *parent, Dialog *_dialog, std::vector<T> &_temp) : QtQueryListUntyped(parent, _dialog), tempRef(_temp)
   {
-    STLVectorValidator<std::vector<T> > *val = dynamic_cast<STLVectorValidator<std::vector<T> > *>(&parentParam.getValidator());
+    // do we have an STLVectorValidator?
+    Validator<std::vector<T> > *val = &parentParam.getValidator();
+    STLVectorValidator<std::vector<T> > *vector_val = NULL;
 
-    // do we have an STLVectorValidator?
-    if (val){
+    // might be hidden inside an And_Validator
+    And_Validator<std::vector<T> > * and_val = dynamic_cast<And_Validator<std::vector<T> > *>(val);
+    if (and_val){
+      if (dynamic_cast<STLVectorValidator<std::vector<T> > *>(and_val->getA()))
+        vector_val = dynamic_cast<STLVectorValidator<std::vector<T> > *>(and_val->getA());
+      else if (dynamic_cast<STLVectorValidator<std::vector<T> > *>(and_val->getB()))
+        vector_val = dynamic_cast<STLVectorValidator<std::vector<T> > *>(and_val->getB());
+    }else{
+      vector_val = dynamic_cast<STLVectorValidator<std::vector<T> > *>(val);
+    }
+
+    if (vector_val){
       // if so, try to use its ElementwiseValidator
-      subParam = new Parameter<T>("sub-param", *(val->getElementwiseValidator()));
+      subParam = new Parameter<T>("sub-param", *(vector_val->getElementwiseValidator()));
     }else{
       subParam = new Parameter<T>("sub-param");