Changeset f10b0c for src/UIElements/TextUI/TextDialog.cpp

Timestamp:

Jun 11, 2012, 9:53:19 AM (13 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:

95f965

Parents:

b9c69d

git-author:

Michael Ankele <ankele@…> (04/24/12 13:55:16)

git-committer:

Frederik Heber <heber@…> (06/11/12 09:53:19)

Message:

disastrously big and ugly commit

• using new Parameter<T> classes:
  • Actions
  • Queries (all UIs)

• TODO:
  • actions crash cause Value is unset
  • no query<BoxVector>

File:

• src/UIElements/TextUI/TextDialog.cpp (modified) (1 diff)

src/UIElements/TextUI/TextDialog.cpp

@@ -38 +38 @@
 }
 
-void TextDialog::queryBoolean(const char* title, std::string description){
-  registerQuery(new BooleanTextQuery(title,description));
+void TextDialog::queryBoolean(Parameter<bool> &param, const char* title, std::string description){
+  registerQuery(new BooleanTextQuery(param, title,description));
 }
 
-void TextDialog::queryInt(const char* title, std::string description){
-  registerQuery(new IntTextQuery(title,description));
+void TextDialog::queryInt(Parameter<int> &param, const char* title, std::string description){
+  registerQuery(new IntTextQuery(param, title,description));
 }
 
-void TextDialog::queryInts(const char* title, std::string description){
-  registerQuery(new IntsTextQuery(title,description));
+void TextDialog::queryInts(Parameter<std::vector<int> > &param, const char* title, std::string description){
+  registerQuery(new IntsTextQuery(param, title,description));
 }
 
-void TextDialog::queryUnsignedInt(const char* title, std::string description){
-  registerQuery(new UnsignedIntTextQuery(title,description));
+void TextDialog::queryUnsignedInt(Parameter<unsigned int> &param, const char* title, std::string description){
+  registerQuery(new UnsignedIntTextQuery(param, title,description));
 }
 
-void TextDialog::queryUnsignedInts(const char* title, std::string description){
-  registerQuery(new UnsignedIntsTextQuery(title,description));
+void TextDialog::queryUnsignedInts(Parameter<std::vector<unsigned int> > &param, const char* title, std::string description){
+  registerQuery(new UnsignedIntsTextQuery(param, title,description));
 }
 
-void TextDialog::queryDouble(const char* title, std::string description){
-  registerQuery(new DoubleTextQuery(title,description));
+void TextDialog::queryDouble(Parameter<double> &param, const char* title, std::string description){
+  registerQuery(new DoubleTextQuery(param, title,description));
 }
 
-void TextDialog::queryDoubles(const char* title, std::string description){
-  registerQuery(new DoublesTextQuery(title,description));
+void TextDialog::queryDoubles(Parameter<std::vector<double> > &param, const char* title, std::string description){
+  registerQuery(new DoublesTextQuery(param, title,description));
 }
 
-void TextDialog::queryString(const char* title, std::string description){
-  registerQuery(new StringTextQuery(title,description));
+void TextDialog::queryString(Parameter<std::string> &param, const char* title, std::string description){
+  registerQuery(new StringTextQuery(param, title,description));
 }
 
-void TextDialog::queryStrings(const char* title, std::string description){
-  registerQuery(new StringsTextQuery(title,description));
+void TextDialog::queryStrings(Parameter<std::vector<std::string> > &param, const char* title, std::string description){
+  registerQuery(new StringsTextQuery(param, title,description));
 }
 
-void TextDialog::queryAtom(const char* title, std::string description) {
-  registerQuery(new AtomTextQuery(title,description));
+void TextDialog::queryAtom(Parameter<const atom *> &param, const char* title, std::string description) {
+  registerQuery(new AtomTextQuery(param, title,description));
 }
 
-void TextDialog::queryAtoms(const char* title, std::string description) {
-  registerQuery(new AtomsTextQuery(title,description));
+void TextDialog::queryAtoms(Parameter<std::vector<const atom *> > &param, const char* title, std::string description) {
+  registerQuery(new AtomsTextQuery(param, title,description));
 }
 
-void TextDialog::queryMolecule(const char* title, std::string description) {
-  registerQuery(new MoleculeTextQuery(title,description));
+void TextDialog::queryMolecule(Parameter<const molecule *> &param, const char* title, std::string description) {
+  registerQuery(new MoleculeTextQuery(param, title,description));
 }
 
-void TextDialog::queryMolecules(const char* title, std::string description) {
-  registerQuery(new MoleculesTextQuery(title,description));
+void TextDialog::queryMolecules(Parameter<std::vector<const molecule *> > &param, const char* title, std::string description) {
+  registerQuery(new MoleculesTextQuery(param, title,description));
 }
 
-void TextDialog::queryVector(const char* title, bool check, std::string description) {
-  registerQuery(new VectorTextQuery(title,check,description));
+void TextDialog::queryVector(Parameter<Vector> &param, const char* title, bool check, std::string description) {
+  registerQuery(new VectorTextQuery(param, title,check,description));
 }
 
-void TextDialog::queryVectors(const char* title, bool check, std::string description) {
-  registerQuery(new VectorsTextQuery(title,check,description));
+void TextDialog::queryVectors(Parameter<std::vector<Vector> > &param, const char* title, bool check, std::string description) {
+  registerQuery(new VectorsTextQuery(param, title,check,description));
 }
 
-void TextDialog::queryBox(const char* title, std::string description) {
-  registerQuery(new BoxTextQuery(title,description));
+void TextDialog::queryBox(Parameter<Box> &param, const char* title, std::string description) {
+  registerQuery(new BoxTextQuery(param, title,description));
 }
 
-void TextDialog::queryElement(const char* title, std::string description){
-  registerQuery(new ElementTextQuery(title,description));
+void TextDialog::queryElement(Parameter<const element *> &param, const char* title, std::string description){
+  registerQuery(new ElementTextQuery(param, title,description));
 }
 
-void TextDialog::queryElements(const char* title, std::string description){
-  registerQuery(new ElementsTextQuery(title,description));
+void TextDialog::queryElements(Parameter<std::vector<const element *> > &param, const char* title, std::string description){
+  registerQuery(new ElementsTextQuery(param, title,description));
 }
 
-void TextDialog::queryFile(const char* title, std::string description){
-  registerQuery(new FileTextQuery(title,description));
+void TextDialog::queryFile(Parameter<boost::filesystem::path> &param, const char* title, std::string description){
+  registerQuery(new FileTextQuery(param, title,description));
 }
 
-void TextDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string description){
-  registerQuery(new RandomNumberDistribution_ParametersTextQuery(title,description));
+void TextDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const char* title, std::string description){
+  registerQuery(new RandomNumberDistribution_ParametersTextQuery(param, title,description));
 }