Changeset 53be34 for src/Actions/ActionTraits.hpp

Timestamp:

Oct 30, 2010, 7:27:57 PM (15 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:

20d46c

Parents:

8bcf3f

git-author:

Frederik Heber <heber@…> (10/26/10 14:04:10)

git-committer:

Frederik Heber <heber@…> (10/30/10 19:27:57)

Message:

ActionTraits returns also MenuName(), MenuPosition(), and also OptionDescriptions().

• is filled within ../src/Actions/Action_impl_header.hpp from MENUNAME and MENUPOSITION.
• OptionDescriptions taken from paramdescriptions and paramtokens.
• OptionDescrptions are also iterable.

File:

• src/Actions/ActionTraits.hpp (modified) (3 diffs)

src/Actions/ActionTraits.hpp

@@ -14 +14 @@
 #endif
 
+#include <map>
 #include <string>
 
@@ -28 +29 @@
 class ActionTraits {
 public:
-  /* TODO: This internal reference is only needed as long as information is not
-   * yet local. Here it is used to gather info from MapOfActions.
-   */
   explicit ActionTraits();
   virtual ~ActionTraits();
 
-  const std::string getCurrentValue();
-  const std::string getDescription();
-  const std::string getShortForm();
-  const std::type_info * getType();
+  typedef std::map<std::string, std::string>::iterator    options_iterator;
+  typedef std::map<std::string, std::string>::const_iterator    options_const_iterator;
+
+  const std::string getCurrentValue() const;
+  const std::string getDescription() const;
+  const std::string getMenuName() const;
+  const int getMenuPosition() const;
+  const std::string getOptionDescription(const std::string descr) const;
+  const std::string getShortForm() const;
+  const std::type_info * getType() const;
+
+  options_iterator getBeginIter();
+  options_iterator getEndIter();
+  options_const_iterator getBeginIter() const;
+  options_const_iterator getEndIter() const;
 
 protected:
@@ -44 +53 @@
   std::string CurrentValue;
   std::string Description;
+  std::string MenuTitle;
+  int MenuPosition;
+  std::map<std::string, std::string> OptionDescription;
   std::string ShortForm;
   const std::type_info *InternalType;