Changeset 3139b2 for src/UIElements

Timestamp:

Nov 7, 2011, 12:24:02 PM (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:

6ca7b9

Parents:

c20b35

git-author:

Frederik Heber <heber@…> (09/26/11 13:38:55)

git-committer:

Frederik Heber <heber@…> (11/07/11 12:24:02)

Message:

Renamed ActionTrait and ActionTraits.

• the specialized Trait contains multiple OptionTraits, hence is now called ActionTrait_s_, where its base class (that just has the OptionTrait for itself) is called ActionTrait.
• This caused many changes in other Action related files.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineParser.cpp (modified) (2 diffs)
• CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp (modified) (1 diff)
• Menu/Menu.cpp (modified) (1 diff)
• Menu/TextMenu/TextMenu.hpp (modified) (2 diffs)
• Menu/TextMenu/TxMenuLeaveAction.cpp (modified) (2 diffs)
• Menu/TextMenu/TxMenuLeaveAction.hpp (modified) (2 diffs)
• Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp (modified) (1 diff)
• TextUI/TextWindow.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -29 +29 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "Actions/OptionRegistry.hpp"
 #include "Actions/OptionTrait.hpp"
@@ -96 +96 @@
     //std::cout << "Current Action to initialize is: " << actioniter->first << std::endl;
 
-    for (ActionTraits::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
+    for (ActionTrait::options_const_iterator optioniter = currentAction->Traits.getBeginIter();
         optioniter != currentAction->Traits.getEndIter();
         ++optioniter) {

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp

@@ -26 +26 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "UIElements/CommandLineUI/CommandLineParser.hpp"
 

src/UIElements/Menu/Menu.cpp

@@ -24 +24 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/Action.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "Menu/Menu.hpp"
 

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -26 +26 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "Menu/TextMenu/TxMenuLeaveAction.hpp"
 #include "Menu/TextMenu/ActionMenuItem.hpp"
@@ -145 +145 @@
     new SubMenuItem(getSuitableShortForm(description), description, MenuInstance, NewMenu->getMenuInstance());
     NewMenu->reserveShortcut('q',"leave"+token);
-    MoleCuilder::ActionTraits leaveTrait(
+    MoleCuilder::ActionTrait leaveTrait(
         MoleCuilder::OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
         token,

src/UIElements/Menu/TextMenu/TxMenuLeaveAction.cpp

@@ -21 +21 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "Menu/TextMenu/TxMenuLeaveAction.hpp"
 #include "CodePatterns/Assert.hpp"
@@ -29 +29 @@
 /** Constructor for class TxMenu::LeaveAction.
  * \param _menu pointer to the containing TxMenu
- * \param &LeaveActionTrait ActionTraits for this Action
+ * \param &LeaveActionTrait ActionTrait for this Action
  */
-TxMenu::LeaveAction::LeaveAction(TxMenu* const _menu, const ActionTraits & LeaveActionTrait) :
+TxMenu::LeaveAction::LeaveAction(TxMenu* const _menu, const ActionTrait & LeaveActionTrait) :
   Action(LeaveActionTrait, true),
   menu(_menu)

src/UIElements/Menu/TextMenu/TxMenuLeaveAction.hpp

@@ -17 +17 @@
 #include "Menu/TextMenu/TxMenu.hpp"
 #include "Actions/Action.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 
 /** This specific action is used to leave a submenu and return to an upper one.
@@ -27 +27 @@
 {
 public:
-  LeaveAction(TxMenu* const, const MoleCuilder::ActionTraits &_trait);
+  LeaveAction(TxMenu* const, const MoleCuilder::ActionTrait &_trait);
   virtual ~LeaveAction();
 

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp

@@ -25 +25 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 
 #include "MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp"

src/UIElements/TextUI/TextWindow.cpp

@@ -34 +34 @@
 #include "Actions/ErrorAction.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionTraits.hpp"
+#include "Actions/ActionTrait.hpp"
 #include "Parser/ChangeTracker.hpp"
 #include "Views/StreamStringView.hpp"
@@ -74 +74 @@
 
   // create a specific quit action for this UI and store in registry
-  ActionTraits quitTrait(OptionTrait("quit", &typeid(void), "quits the program"));
+  ActionTrait quitTrait(OptionTrait("quit", &typeid(void), "quits the program"));
   quitAction = new MethodAction(quitTrait,boost::bind(&TxMenu::doQuit,main_menu->getMenuInstance()),true);
   new ActionMenuItem('q',"quit",main_menu->getMenuInstance(),"quit");