Changeset 628577 for src/UIElements

Timestamp:

Sep 19, 2013, 8:23:51 PM (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:

1d3563

Parents:

732507

git-author:

Frederik Heber <heber@…> (08/16/13 10:32:17)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:51)

Message:

Introduced ActionQueue which contains internal ActionRegistry.

• ActionQueue inherits ActionRegistry' singleton status.
• replaced all occurrences of AR::getInstance() by wrapper through AQ.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineParser.cpp (modified) (3 diffs)
• CommandLineUI/CommandLineWindow.cpp (modified) (2 diffs)
• CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp (modified) (3 diffs)
• Menu/Menu.cpp (modified) (2 diffs)
• Menu/MenuDescription.cpp (modified) (2 diffs)
• Menu/Qt4/QtMenuPipe.cpp (modified) (2 diffs)
• Menu/TextMenu/ActionMenuItem.cpp (modified) (2 diffs)
• Menu/TextMenu/TextMenu.hpp (modified) (2 diffs)
• Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp (modified) (3 diffs)
• Qt4/QtMainWindow.cpp (modified) (2 diffs)
• TextUI/TextWindow.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -43 +43 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "Actions/OptionRegistry.hpp"
@@ -112 +112 @@
   std::set<std::string> AlreadyAddedOptionNames;
 
-  ActionRegistry &AR = ActionRegistry::getInstance();
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   bool ActionAlreadyAdded_flag = false;
   for (ActionRegistry::const_iterator actioniter = AR.getBeginIter(); actioniter != AR.getEndIter(); ++actioniter) {
@@ -482 +482 @@
   std::map <std::string, std::string> result;
 
-  ActionRegistry &AR = ActionRegistry::getInstance();
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
     if ((iter->second)->Traits.hasShortForm()) {

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -44 +44 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 
 #include "UIElements/CommandLineUI/CommandLineParser.hpp"
@@ -65 +65 @@
 
 void CommandLineWindow::display() {
-  //cout << ActionRegistry::getInstance();
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
+  //cout << AR;
 
   // go through all possible actions
   LOG(0, "Calling Actions ... ");
   for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
-    if (ActionRegistry::getInstance().isActionPresentByName(*CommandRunner)) {
+    if (AR.isActionPresentByName(*CommandRunner)) {
 //      LOG1, "INFO: Checking presence of " << *CommandRunner << ": " << "calling " << *CommandRunner);
-      ActionRegistry::getInstance().getActionByName(*CommandRunner)->call();
+      AR.getActionByName(*CommandRunner)->call();
     } else {
 //      LOG(1, "INFO: Checking presence of " << *CommandRunner << ": " << "absent.");

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp

@@ -40 +40 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "UIElements/CommandLineUI/CommandLineParser.hpp"
@@ -62 +62 @@
 void CommandLineParser_ActionRegistry_ConsistencyTest::setUp()
 {
-  CPPUNIT_ASSERT_NO_THROW(AR = ActionRegistry::getPointer());
+  AR = &ActionQueue::getInstance().getActionRegistry();
   CLP = CommandLineParser::getPointer();
 };
@@ -70 +70 @@
 {
   CommandLineParser::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
   // these come about because of the validators accessing them instantiated
   // by ActionRegistry. In ActionRegistryUnitTest we used stubs for them but

src/UIElements/Menu/Menu.cpp

@@ -37 +37 @@
 #include <iostream>
 
-#include "Actions/ActionRegistry.hpp"
 #include "Actions/Action.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "Menu/Menu.hpp"
@@ -122 +122 @@
 {
   // go through all actions and add those belonging to this menu
-  ActionRegistry &AR = ActionRegistry::getInstance();
+  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
   for (ActionRegistry::const_iterator iter = AR.getBeginIter();
       iter != AR.getEndIter();

src/UIElements/Menu/MenuDescription.cpp

@@ -39 +39 @@
 #include <string>
 
-//#include "Actions/ActionRegistry.hpp"
+//#include "Actions/ActionQueue.hpp"
 #include "Menu/MenuDescription.hpp"
 
@@ -158 +158 @@
 //  std::multimap <std::string, std::string> result;
 //
-//  ActionRegistry &AR = ActionRegistry::getInstance();
+//  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry()();
 //  for (ActionRegistry::const_iterator iter = AR.getBeginIter();iter != AR.getEndIter();++iter) {
 //    std::cout << "Inserting " << (iter->second)->getName() << " into menu " << (iter->second)->Traits.getMenuName() << std::endl;

src/UIElements/Menu/Qt4/QtMenuPipe.cpp

@@ -40 +40 @@
 #include "QtMenuPipe.hpp"
 
-#include "Actions/ActionRegistry.hpp"
 #include "Actions/Action.hpp"
 #include "Actions/ActionExceptions.hpp"
+#include "Actions/ActionQueue.hpp"
 
 using namespace MoleCuilder;
@@ -55 +55 @@
 
 void QtMenuPipe::called() {
-  Action* action = ActionRegistry::getInstance().getActionByName(ActionName);
+  Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
   try{
     action->call();

src/UIElements/Menu/TextMenu/ActionMenuItem.cpp

@@ -39 +39 @@
 #include "Menu/TextMenu/ActionMenuItem.hpp"
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 
 using namespace MoleCuilder;
@@ -53 +53 @@
 
 void ActionMenuItem::doTrigger() {
-  Action* action = ActionRegistry::getInstance().getActionByName(ActionName);
+  Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
   action->call();
 }
 
 bool ActionMenuItem::isActive() {
-  Action* action = ActionRegistry::getInstance().getActionByName(ActionName);
+  Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
   return action->isActive();
 }

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -25 +25 @@
 #include "Menu/MenuInterface.hpp"
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "Menu/TextMenu/TxMenuLeaveAction.hpp"
@@ -148 +148 @@
         MoleCuilder::OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
         token,
-        MoleCuilder::ActionRegistry::getInstance().getLastPosition(token)+2); // have a separator in between
+        MoleCuilder::ActionQueue::getInstance().getActionRegistry().getLastPosition(token)+2); // have a separator in between
     new TxMenu::LeaveAction(NewMenu->getMenuInstance(), leaveTrait);
     NewMenu->init();

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp

@@ -39 +39 @@
 
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "World.hpp"
@@ -60 +60 @@
 void MenuDescription_ActionRegistry_ConsistencyTest::setUp()
 {
-  CPPUNIT_ASSERT_NO_THROW(AR = ActionRegistry::getPointer());
+  AR = &ActionQueue::getInstance().getActionRegistry();
 };
 
@@ -66 +66 @@
 void MenuDescription_ActionRegistry_ConsistencyTest::tearDown()
 {
-  ActionRegistry::purgeInstance();
+  ActionQueue::purgeInstance();
   // these come about because of the validators accessing them instantiated
   // by ActionRegistry. In ActionRegistryUnitTest we used stubs for them but

src/UIElements/Qt4/QtMainWindow.cpp

@@ -68 +68 @@
 #include "CodePatterns/Verbose.hpp"
 #include "Actions/Action.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Parser/ChangeTracker.hpp"
 #include "Parser/FormatParserStorage.hpp"
@@ -172 +172 @@
           MoleCuilder::WorldOutput();
         else{
-          Action* action = ActionRegistry::getInstance().getActionByName("output-as");
+          Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName("output-as");
           try{
             action->call();

src/UIElements/TextUI/TextWindow.cpp

@@ -48 +48 @@
 #include "Actions/MethodAction.hpp"
 #include "Actions/ErrorAction.hpp"
-#include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionTrait.hpp"
 #include "Parser/ChangeTracker.hpp"
@@ -86 +86 @@
 
   // save has reserved key 's'
-//  Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
+//  Action *saveConfigAction = ActionQueue::getInstance().getActionRegistry().getActionByName("output");
   new ActionMenuItem('s',"save current setup to config files",main_menu->getMenuInstance(),"output");