Changeset 026bef for src/UIElements/Views/Qt4/Qt3D/ObservedValue_wCallback.hpp

Timestamp:

Feb 12, 2016, 11:15:06 PM (9 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:

15c8a9

Parents:

099f67

git-author:

Frederik Heber <heber@…> (01/25/16 11:01:10)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:06)

Message:

Changed GLMoleculeObject_...:countSubjectKilled() to taking id parameter.

• this is a precursor for when the ObservedValues reside with QtInstanceInformationBoard.
• enhanced ObservedValue_wCallback to take a bound getIndex function().
• additionally, we route internally to ObservedValue::get() and this gets us out of the painful situation where we need to supply an index getter to the ObservedValue that monitors the index (and hence must be present already to bind to its get function).

File:

• src/UIElements/Views/Qt4/Qt3D/ObservedValue_wCallback.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/Qt3D/ObservedValue_wCallback.hpp

@@ -18 +18 @@
 #include "CodePatterns/Observer/Observable.hpp"
 
+#include <string>
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+
 /** We derive from ObservedValue in order to tell owning instance about
  * subjectKilled() having been called.
  */
-template <class T>
+template <class T, class id=T>
 class ObservedValue_wCallback : public ObservedValue<T>
 {
@@ -31 +36 @@
       const T &_initialvalue,
       const Observable::channels_t &_channels,
-      const boost::function<void()> &_callback) :
+      const boost::function<void(const id)> &_callback,
+      const boost::function<const id()> &_getId) :
         ObservedValue<T>(_owner, _recalcMethod, _name, _initialvalue, _channels),
-        callback(_callback)
+        callback(_callback),
+        getId(_getId)
   {}
   virtual ~ObservedValue_wCallback()
@@ -42 +49 @@
   {
     ObservedValue<T>::subjectKilled(publisher);
-    callback();
+    callback(getId());
   }
 
 private:
   //!> callback function to tell other entity about subjectKilled
-  const boost::function<void()> callback;
+  const boost::function<void(const id)> callback;
+  const boost::function<const id()> getId;
+};
+
+/** Specialization of ObservedValue_wCallback for the index ObservedValue.
+ *
+ * The index serves as the unique identifier for the object instance whose
+ * properties are monitored in ObservedValue. Hence, how to give a subjectKilled()
+ * with an external getId() function? For the index the ObservedValue::get() is
+ * the getId() we need to call! Hence, we may simply connect these internally
+ * in this partial template specialization.
+ *
+ * Because atomicNumber_t, atomId_t and moleculeId_t are not unique types but
+ * -- at the writing of this class -- just typedefs, we have to resort to the
+ * trick with two constructors, one taking an external getId(), the other
+ * routing the getId() internally by binding to ObservedValue<T>::get().
+ */
+template <class T>
+class ObservedValue_wCallback<T,T> : public ObservedValue<T>
+{
+public:
+  ObservedValue_wCallback(
+      const Observable * const _owner,
+      const boost::function<T()> &_recalcMethod,
+      const std::string &_name,
+      const T &_initialvalue,
+      const Observable::channels_t &_channels,
+      const boost::function<void(const T)> &_callback,
+      const boost::function<const T()> &_getId) :
+        ObservedValue<T>(_owner, _recalcMethod, _name, _initialvalue, _channels),
+        callback(_callback),
+        getId(_getId)
+  {}
+  ObservedValue_wCallback(
+      const Observable * const _owner,
+      const boost::function<T()> &_recalcMethod,
+      const std::string &_name,
+      const T &_initialvalue,
+      const Observable::channels_t &_channels,
+      const boost::function<void(const T)> &_callback) :
+        ObservedValue<T>(_owner, _recalcMethod, _name, _initialvalue, _channels),
+        callback(_callback),
+        getId(boost::bind(&ObservedValue<T>::get, this))
+  {}
+  virtual ~ObservedValue_wCallback()
+  {}
+
+protected:
+  virtual void subjectKilled(Observable *publisher)
+  {
+    ObservedValue<T>::subjectKilled(publisher);
+    callback(getId());
+  }
+
+private:
+  //!> callback function to tell other entity about subjectKilled
+  const boost::function<void(const T)> callback;
+  const boost::function<const T()> getId;
 };