Changeset 29b52b

Timestamp:

Sep 12, 2014, 8:00:16 AM (10 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:

8859b5

Parents:

9bdcc9

Message:

Made ActionQueue observable.

• has channel ActionQueued.
• this is preparatory to know about most used Actions.

Location:

src/Actions

Files:

• ActionQueue.cpp (modified) (4 diffs)
• ActionQueue.hpp (modified) (5 diffs)

src/Actions/ActionQueue.cpp

@@ -55 +55 @@
 using namespace MoleCuilder;
 
+const Action* ActionQueue::_lastchangedaction = NULL;
+
 ActionQueue::ActionQueue() :
+    Observable("ActionQueue"),
     AR(new ActionRegistry()),
     history(new ActionHistory),
@@ -66 +69 @@
     run_thread_isIdle(true)
 #endif
-{}
+{
+  // channels of observable
+  Channels *OurChannel = new Channels;
+  NotificationChannels.insert( std::make_pair(static_cast<Observable *>(this), OurChannel) );
+  // add instance for each notification type
+  for (size_t type = 0; type < NotificationType_MAX; ++type)
+    OurChannel->addChannel(type);
+}
 
 ActionQueue::~ActionQueue()
@@ -91 +101 @@
 void ActionQueue::queueAction(Action *_action, enum Action::QueryOptions state)
 {
+  OBSERVE;
+  NOTIFY(ActionQueued);
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
@@ -116 +128 @@
   mtx_queue.unlock();
 #endif
+  _lastchangedaction = newaction;
 }
 

src/Actions/ActionQueue.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
+#include "CodePatterns/Observer/Channels.hpp"
+#include "CodePatterns/Observer/Observable.hpp"
 
 #ifdef HAVE_ACTION_THREAD
@@ -36 +38 @@
 class ActionRegistry;
 class ActionTrait;
+
+namespace Queuedetail {
+  template <class T> const T* lastChanged()
+  {
+    ASSERT(0, "Queuedetail::lastChanged() - only specializations may be used.");
+    return NULL;
+  }
+}
 
 /** This class combines the whole handling of Actions into a single class.
@@ -42 +52 @@
  * automatically queued and placed into a History after execution.
  */
-class ActionQueue : public Singleton<ActionQueue>
+class ActionQueue : public Singleton<ActionQueue>, public Observable
 {
   friend class Singleton<ActionQueue>;
@@ -49 +59 @@
   typedef std::vector< Action * > ActionQueue_t;
 
+  //!> channels for this observable
+  enum NotificationType {
+    ActionQueued,  // new action was queued
+    NotificationType_MAX  // denotes the maximum of available notification types
+  };
+
+  //>! access to last changed element (atom or molecule)
+  template <class T> const T* lastChanged() const
+  { return Queuedetail::lastChanged<T>(); }
+
   /** Queues the Action with \a name to be called.
    *
@@ -213 +233 @@
   ~ActionQueue();
 
+private:
+  friend const Action *Queuedetail::lastChanged<Action>();
+  static const Action *_lastchangedaction;
+
   //!> ActionRegistry to spawn new actions
   ActionRegistry *AR;