Changeset 26b4eb4 for src/Actions

Timestamp:

Jun 27, 2014, 9:32:02 PM (11 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:

378f2d5

Parents:

3ded2b7

git-author:

Frederik Heber <heber@…> (06/19/14 09:17:06)

git-committer:

Frederik Heber <heber@…> (06/27/14 21:32:02)

Message:

Added observable ActionStatusList to ActionQueue.

• this allows to fetch Status messages from Actions at a central place.
• Action::pushStatus() as befriended proxy to ActionQueue::pushStatus() added.
• equipped ActionStatusList with a thread lock to protect access.

Location:

src/Actions

Files:

• Action.cpp (modified) (1 diff)
• Action.hpp (modified) (2 diffs)
• ActionQueue.hpp (modified) (4 diffs)
• ActionStatusList.cpp (added)
• ActionStatusList.hpp (added)
• Makefile.am (modified) (2 diffs)

src/Actions/Action.cpp

@@ -177 +177 @@
 }
 
+void Action::pushStatus(const std::string& _msg)
+{
+  ActionQueue::getInstance().pushStatus(_msg);
+}
+

src/Actions/Action.hpp

@@ -24 +24 @@
  */
 #define NOPARAM_DEFAULT BOOST_PP_NIL
+
+/** Nicely visible short-hand for push a status message
+ *
+ */
+#ifndef STATUS
+#define STATUS(msg) pushStatus(msg)
+#endif
 
 // forward declaration
@@ -270 +277 @@
   static void insertAction(Action *_action, enum Action::QueryOptions state);
 
+  /** Proxy function to grant all derived Actions access to
+   * ActionQueue::pushStatus().
+   *
+   * \param _msg status message to push
+   */
+  void pushStatus(const std::string& _msg);
+
 private:
 

src/Actions/ActionQueue.hpp

@@ -24 +24 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionState.hpp"
+#include "Actions/ActionStatusList.hpp"
 
 #ifdef HAVE_ACTION_THREAD
@@ -127 +128 @@
 #endif
 
+  /** Getter to ref to list of status messages.
+   *
+   * This is meant for UIs to registers as Observables.
+   *
+   * \return ref to StatusList variable
+   */
+  ActionStatusList& getStatusList()
+  { return StatusList; }
+
 private:
   //!> grant Action access to internal history functions.
@@ -138 +148 @@
   void addElement(Action* _Action, ActionState::ptr _state);
 
+  /** Advocate function to add status message to the list.
+   *
+   */
+  void pushStatus(const std::string &_msg)
+  { StatusList.pushMessage(_msg); }
+
   /** Wrapper function to clear ActionHistory.
    *
@@ -221 +237 @@
   boost::mutex mtx_idle;
 #endif
+
+  //!> internal list of status messages from Actions for UIs to display
+  ActionStatusList StatusList;
 };
 

src/Actions/Makefile.am

@@ -8 +8 @@
   Actions/ActionRegistry.cpp \
   Actions/ActionSequence.cpp \
+  Actions/ActionStatusList.cpp \
   Actions/ActionTrait.cpp \
   Actions/ErrorAction.cpp \
@@ -33 +34 @@
   Actions/ActionSequence.hpp \
   Actions/ActionState.hpp \
+  Actions/ActionStatusList.hpp \
   Actions/ActionTrait.hpp \
   Actions/ActionTraits.hpp \