Changeset 713a43

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:

e59e8e

Parents:

66f712

git-author:

Michael Ankele <ankele@…> (11/02/12 14:57:04)

git-committer:

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

Message:

QtQueryList can use STLVectorValidator's ElementwiseValidator

Location:

src

Files:

• Parameters/Validators/STLVectorValidator.hpp (modified) (1 diff)
• UIElements/Qt4/Query/AtomsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/DoublesQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/ElementsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/FilesQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/IntsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/MoleculesQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/QtQueryList.hpp (modified) (2 diffs)
• UIElements/Qt4/Query/StringsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/VectorsQtQuery.cpp (modified) (1 diff)

src/Parameters/Validators/STLVectorValidator.hpp

@@ -122 +122 @@
   }
 
+  Validator<value_type> *getElementwiseValidator(){ return ElementwiseValidator;  }
+  Validator<size_t> *getNumberOfElementsValidator(){  return NumberOfElementsValidator; }
+
 private:
   /** Constructor for class STLVectorValidator, number of elements given by \ref RangeValidator.

src/UIElements/Qt4/Query/AtomsQtQuery.cpp

@@ -45 +45 @@
 QtDialog::AtomsQtQuery::AtomsQtQuery(Parameter<std::vector<const atom *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<const atom *> >(_param, _title),
-    QtQueryList<const atom *>(_parent, _dialog, temp)
+    QtQueryList<const atom *>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/DoublesQtQuery.cpp

@@ -45 +45 @@
 QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<double> >(_param, _title),
-    QtQueryList<double>(_parent, _dialog, temp)
+    QtQueryList<double>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/ElementsQtQuery.cpp

@@ -46 +46 @@
 QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<const element *> >(_param, _title),
-    QtQueryList<const element *>(_parent, _dialog, temp)
+    QtQueryList<const element *>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/FilesQtQuery.cpp

@@ -46 +46 @@
 QtDialog::FilesQtQuery::FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<boost::filesystem::path> >(_param, _title),
-    QtQueryList<boost::filesystem::path>(_parent, _dialog, temp)
+    QtQueryList<boost::filesystem::path>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/IntsQtQuery.cpp

@@ -45 +45 @@
 QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<int> >(_param, _title),
-    QtQueryList<int>(_parent, _dialog, temp)
+    QtQueryList<int>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

@@ -45 +45 @@
 QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<const molecule *> >(_param, _title),
-    QtQueryList<const molecule *>(_parent, _dialog, temp)
+    QtQueryList<const molecule *>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/QtQueryList.hpp

@@ -17 +17 @@
 #include "UIElements/Dialog.hpp"
 #include "Parameters/Parameter.hpp"
+#include "Parameters/Validators/STLVectorValidator.hpp"
 
 class QListWidget;
@@ -50 +51 @@
 class QtQueryList : public QtQueryListUntyped {
 public:
-  QtQueryList(QBoxLayout *parent, Dialog *_dialog, std::vector<T> &_temp) : QtQueryListUntyped(parent, _dialog), tempRef(_temp)
+  QtQueryList(Parameter<std::vector<T> > &parentParam, QBoxLayout *parent, Dialog *_dialog, std::vector<T> &_temp) : QtQueryListUntyped(parent, _dialog), tempRef(_temp)
   {
-    subParam = new Parameter<T>("sub-param");
+    STLVectorValidator<std::vector<T> > *val = dynamic_cast<STLVectorValidator<std::vector<T> > *>(&parentParam.getValidator());
+
+    // do we have an STLVectorValidator?
+    if (val){
+      // if so, try to use its ElementwiseValidator
+      subParam = new Parameter<T>("sub-param", *(val->getElementwiseValidator()));
+    }else{
+      subParam = new Parameter<T>("sub-param");
+    }
   }
   virtual ~QtQueryList()

src/UIElements/Qt4/Query/StringsQtQuery.cpp

@@ -45 +45 @@
 QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<std::string> >(_param, _title),
-    QtQueryList<std::string>(_parent, _dialog, temp)
+    QtQueryList<std::string>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp

@@ -45 +45 @@
 QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<unsigned int> >(_param, _title),
-    QtQueryList<unsigned int>(_parent, _dialog, temp)
+    QtQueryList<unsigned int>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);

src/UIElements/Qt4/Query/VectorsQtQuery.cpp

@@ -46 +46 @@
 QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
     QtQuery<std::vector<Vector> >(_param, _title),
-    QtQueryList<Vector>(_parent, _dialog, temp)
+    QtQueryList<Vector>(_param, _parent, _dialog, temp)
 {
   ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);