Changeset 8f6a27 for src/Shapes

Timestamp:

Nov 15, 2012, 5:31:08 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:

1c9588

Parents:

d8421f

git-author:

Michael Ankele <ankele@…> (09/13/12 12:40:54)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:31:08)

Message:

made ShapeRegistry an Observable

Location:

src/Shapes

Files:

• ShapeRegistry.cpp (modified) (2 diffs)
• ShapeRegistry.hpp (modified) (3 diffs)

src/Shapes/ShapeRegistry.cpp

@@ -39 +39 @@
 #include "CodePatterns/Singleton_impl.hpp"
 #include "CodePatterns/Registry_impl.hpp"
+#include "CodePatterns/Observer/Channels.hpp"
 
-ShapeRegistry::ShapeRegistry()
+ShapeRegistry::ShapeRegistry() :
+  Observable::Observable("ShapeRegistry")
 {
+  Channels *OurChannel = new Channels;
+  NotificationChannels.insert( std::make_pair(this, OurChannel) );
+  // add instance for each notification type
+  for (size_t type = 0; type < NotificationType_MAX; ++type)
+    OurChannel->addChannel(type);
 }
 
@@ -51 +58 @@
 void ShapeRegistry::addShape(Shape s)
 {
+  OBSERVE;
   Shape *instance = new Shape(s);
   registerInstance(instance);
+  NOTIFY(ShapeInserted);
 }
 

src/Shapes/ShapeRegistry.hpp

@@ -15 +15 @@
 #endif
 
+#include "CodePatterns/Observer/Observable.hpp"
 #include "CodePatterns/Registry.hpp"
 #include "CodePatterns/Singleton.hpp"
@@ -20 +21 @@
 #include "Shape.hpp"
 
-class ShapeRegistry : public Singleton<ShapeRegistry>, public Registry<Shape>
+class ShapeRegistry : public Singleton<ShapeRegistry>, public Registry<Shape>, public Observable
 {
   friend class Singleton<ShapeRegistry>;
@@ -28 +29 @@
   Shape* getShapeByName(const std::string name);
   bool isShapePresentByName(const std::string name) const;
+
+  enum NotificationType {
+    ShapeInserted,
+    ShapeRemoved,
+    SelectionChanged,
+    NotificationType_MAX
+  };
 
 private: