Changeset f0964c

Timestamp:

Oct 14, 2013, 11:41:38 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:

b677ab

Parents:

4b2e05

git-author:

Frederik Heber <heber@…> (09/07/13 15:10:08)

git-committer:

Frederik Heber <heber@…> (10/14/13 23:41:38)

Message:

QtHomologyList also observes PotentialRegistry.

• PotentialRegistry is now an Observable, updating when instances (un)register.

Location:

src

Files:

• Potentials/PotentialRegistry.cpp (modified) (1 diff)
• Potentials/PotentialRegistry.hpp (modified) (3 diffs)
• UIElements/Views/Qt4/QtHomologyList.cpp (modified) (5 diffs)
• UIElements/Views/Qt4/QtHomologyList.hpp (modified) (1 diff)

src/Potentials/PotentialRegistry.cpp

@@ -40 +40 @@
 #include "CodePatterns/Registry_impl.hpp"
 
+PotentialRegistry::PotentialRegistry() :
+  Observable("PotentialRegistry")
+{}
+
+
+void PotentialRegistry::registerInstance(EmpiricalPotential *potential)
+{
+  OBSERVE;
+  Registry<EmpiricalPotential>::registerInstance(potential);
+}
+void PotentialRegistry::unregisterInstance(EmpiricalPotential *potential)
+{
+  OBSERVE;
+  Registry<EmpiricalPotential>::unregisterInstance(potential);
+}
+
 CONSTRUCT_SINGLETON(PotentialRegistry)
 CONSTRUCT_REGISTRY(EmpiricalPotential)

src/Potentials/PotentialRegistry.hpp

@@ -14 +14 @@
 #endif
 
+#include "CodePatterns/Observer/Observable.hpp"
 #include "CodePatterns/Registry.hpp"
 #include "CodePatterns/Singleton.hpp"
@@ -29 +30 @@
  * ones.
  */
-class PotentialRegistry : public Singleton<PotentialRegistry>, public Registry<EmpiricalPotential>
+class PotentialRegistry :
+    public Singleton<PotentialRegistry>,
+    public Registry<EmpiricalPotential>,
+    public Observable
 {
   friend class Singleton<PotentialRegistry>;
@@ -36 +40 @@
 public:
 
+  void registerInstance(EmpiricalPotential*);
+  void unregisterInstance(EmpiricalPotential*);
+
 private:
-  PotentialRegistry() {}
-  ~PotentialRegistry() {}
+  PotentialRegistry();
+  virtual ~PotentialRegistry() {}
 };
 

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -45 +45 @@
 
 #include "Fragmentation/Homology/HomologyContainer.hpp"
+#include "Potentials/PotentialRegistry.hpp"
 #include "World.hpp"
 
@@ -54 +55 @@
 QtHomologyList::QtHomologyList(QWidget * _parent) :
     QWidget(_parent),
-    Observer("QtHomologyList")
+    Observer("QtHomologyList"),
+    potentialregistry_enabled(false)
 {
   QSplitter *splitter = new QSplitter (Qt::Horizontal, this );
@@ -78 +80 @@
         HomologyContainer &homologies = World::getInstance().getHomologies();
         homologies.signOn(this);
+        PotentialRegistry::getInstance().signOn(this);
+        potentialregistry_enabled = true;
 
   connect(treewidget,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
@@ -87 +91 @@
   HomologyContainer &homologies = World::getInstance().getHomologies();
   homologies.signOff(this);
+  if (potentialregistry_enabled)
+    PotentialRegistry::getInstance().signOff(this);
 }
 
@@ -150 +156 @@
 {
   // as a new instance should always already be present ... just sign on
-  HomologyContainer &homologies = World::getInstance().getHomologies();
-  homologies.signOn(this);
+  if (static_cast<PotentialRegistry *>(publisher) == PotentialRegistry::getPointer()) {
+    potentialregistry_enabled = false;
+  } else {
+    // its HomologyContainer
+  }
 }
 

src/UIElements/Views/Qt4/QtHomologyList.hpp

@@ -53 +53 @@
   //!> flag to indicate that we currently clear the view, avoids thread collisions
   bool clearing;
+  //!> flag to indicate whether we are subscribed to PotentialRegistry
+  bool potentialregistry_enabled;
 
 private: