Changeset 7188b1 for src/World.hpp

Timestamp:

Oct 6, 2011, 4:06:10 PM (13 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:

db7e6d

Parents:

e638f9

git-author:

Frederik Heber <heber@…> (09/01/11 13:49:14)

git-committer:

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

Message:

Introduced atom_observables and GLWorldView observes World, GLMoleculeObject_atom observes its atom.

Observer changes:

• new Channels pattern required from CodePatterns 1.1.5 and that Observable signing on and off is now with const instance possible.
• class atom is now observable, encapsulated in class AtomObservable:
  • enums have notification types
  • we use NotificationChannels of Observable to emit these distinct types.
• atominfo, particleinfo, bondedparticleinfo all have OBSERVE and NOTIFY(..) in their setter functions (thx encapsulation).
• class GLMoleculeObject_atom signs on to atom to changes to position, element, and index.
• World equally has notifications for atom (new,remove) and molecules (new, remove).
• GLWorldView now observes World for these changes.

Other changes:

• removed additional hierarchy level for GLWidget of molecules (i.e. GLMoleculeScene removed and incorporated into GLWorldScene).

File:

• src/World.hpp (modified) (5 diffs)

src/World.hpp

@@ -55 +55 @@
 /********************************************** Class World *******************************/
 
+namespace detail {
+  template <class T> const T* lastChanged()
+  {
+    ASSERT(0, "detail::lastChanged() - only specializations may be used.");
+    return NULL;
+  }
+}
+
 class World : public Singleton<World>, public Observable
 {
@@ -84 +92 @@
   typedef ATOMSET(std::vector) AtomComposite;
 
-  /***** getter and setter *****/
+    /******* Notifications *******/
+
+  //!> enumeration of present notification types
+  enum NotificationType {
+    AtomInserted,
+    AtomRemoved,
+    AtomChanged,
+    MoleculeInserted,
+    MoleculeRemoved,
+    MoleculeChanged,
+    NotificationType_MAX
+  };
+
+  //>! access to last changed element (atom or molecule)
+  template <class T> const T* lastChanged() const
+  { return detail::lastChanged<T>(); }
+
+    /***** getter and setter *****/
   // reference to pointer is used for legacy reason... reference will be removed latter to keep encapsulation of World object
   /**
@@ -106 +131 @@
    */
   config *&getConfig();
+
+  /** Returns a notification_ptr for a specific type.
+   *
+   * @param type request type
+   * @return reference to instance
+   */
+  Notification_ptr getNotification(enum NotificationType type) const;
 
   /**
@@ -385 +417 @@
   void defragMoleculeIdPool();
 
+  friend const atom *detail::lastChanged<atom>();
+  friend const molecule *detail::lastChanged<molecule>();
+  static atom *_lastchangedatom;
+  static molecule*_lastchangedmol;
+
   BondGraph *BG;
   periodentafel *periode;
@@ -442 +479 @@
 };
 
+/** Externalized stuff as member functions cannot be specialized without
+ *  specializing the class, too.
+ */
+namespace detail {
+  template <>       inline  const atom* lastChanged<atom>() { return World::_lastchangedatom; }
+  template <>       inline  const molecule* lastChanged<molecule>() { return World::_lastchangedmol; }
+}
+
+
 #endif /* WORLD_HPP_ */