Changeset 1d3563 for src/UIElements

Timestamp:

Sep 19, 2013, 8:23:52 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:

690741

Parents:

628577

git-author:

Frederik Heber <heber@…> (08/16/13 11:15:29)

git-committer:

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

Message:

Main functions of ActionRegistry are now tunneled through ActionQueue.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineWindow.cpp (modified) (2 diffs)
• Menu/Qt4/QtMenuPipe.cpp (modified) (1 diff)
• Menu/TextMenu/ActionMenuItem.cpp (modified) (1 diff)
• Menu/TextMenu/TextMenu.hpp (modified) (1 diff)
• Qt4/QtMainWindow.cpp (modified) (1 diff)
• TextUI/TextWindow.cpp (modified) (1 diff)

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -65 +65 @@
 
 void CommandLineWindow::display() {
-  ActionRegistry &AR = ActionQueue::getInstance().getActionRegistry();
+  ActionQueue &AQ = ActionQueue::getInstance();
   //cout << AR;
 
@@ -71 +71 @@
   LOG(0, "Calling Actions ... ");
   for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
-    if (AR.isActionPresentByName(*CommandRunner)) {
+    if (AQ.isActionKnownByName(*CommandRunner)) {
 //      LOG1, "INFO: Checking presence of " << *CommandRunner << ": " << "calling " << *CommandRunner);
-      AR.getActionByName(*CommandRunner)->call();
+      AQ.getActionByName(*CommandRunner)->call();
     } else {
 //      LOG(1, "INFO: Checking presence of " << *CommandRunner << ": " << "absent.");

src/UIElements/Menu/Qt4/QtMenuPipe.cpp

@@ -55 +55 @@
 
 void QtMenuPipe::called() {
-  Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
+  Action* action = ActionQueue::getInstance().getActionByName(ActionName);
   try{
     action->call();

src/UIElements/Menu/TextMenu/ActionMenuItem.cpp

@@ -53 +53 @@
 
 void ActionMenuItem::doTrigger() {
-  Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
+  Action* action = ActionQueue::getInstance().getActionByName(ActionName);
   action->call();
 }
 
 bool ActionMenuItem::isActive() {
-  Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName(ActionName);
+  Action* action = ActionQueue::getInstance().getActionByName(ActionName);
   return action->isActive();
 }

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -148 +148 @@
         MoleCuilder::OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
         token,
-        MoleCuilder::ActionQueue::getInstance().getActionRegistry().getLastPosition(token)+2); // have a separator in between
+        MoleCuilder::ActionQueue::getInstance().getLastPosition(token)+2); // have a separator in between
     new TxMenu::LeaveAction(NewMenu->getMenuInstance(), leaveTrait);
     NewMenu->init();

src/UIElements/Qt4/QtMainWindow.cpp

@@ -172 +172 @@
           MoleCuilder::WorldOutput();
         else{
-          Action* action = ActionQueue::getInstance().getActionRegistry().getActionByName("output-as");
+          Action* action = ActionQueue::getInstance().getActionByName("output-as");
           try{
             action->call();

src/UIElements/TextUI/TextWindow.cpp

@@ -86 +86 @@
 
   // save has reserved key 's'
-//  Action *saveConfigAction = ActionQueue::getInstance().getActionRegistry().getActionByName("output");
+//  Action *saveConfigAction = ActionQueue::getInstance().getActionByName("output");
   new ActionMenuItem('s',"save current setup to config files",main_menu->getMenuInstance(),"output");