Changeset 6b474e for src/UIElements/Views

Timestamp:

Jun 23, 2015, 6:29:02 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:

748318

Parents:

69b434

git-author:

Frederik Heber <heber@…> (05/31/15 15:09:31)

git-committer:

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

Message:

QtElementList now listens to AtomObserver and not MoleculeListClass anymore.

Location:

src/UIElements/Views/Qt4

Files:

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

src/UIElements/Views/Qt4/QtElementList.cpp

@@ -40 +40 @@
 
 #include "Atom/atom.hpp"
-#include "Formula.hpp"
-#include "molecule.hpp"
-#include "MoleculeListClass.hpp"
+#include "Atom/AtomObserver.hpp"
 
 #include "Element/element.hpp"
@@ -71 +69 @@
         refill();
 
-        molecules = World::getInstance().getMolecules();
-        molecules->signOn(this);
+        AtomObserver::getInstance().signOn(this, atom::ElementChanged);
 
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
@@ -80 +77 @@
 QtElementList::~QtElementList()
 {
-        molecules->signOff(this);
+  AtomObserver::getInstance().signOff(this, atom::ElementChanged);
 }
 
-void QtElementList::update(Observable *publisher) {
+void QtElementList::update(Observable *publisher)
+{
+  ASSERT(0, "QtElementList::update() - is not enlisted to any general update.");
+}
 
-  dirty = true;
 
-  // force an update from Qt...
-  clear();
-  //emit changed(); doesn't work!?!
+void QtElementList::recieveNotification(Observable *publisher, Notification_ptr notification)
+{
+  if ((publisher == static_cast<Observable *>(&AtomObserver::getInstance()))
+      && (notification->getChannelNo() == atom::ElementChanged)) {
+    dirty = true;
+
+    // force an update from Qt...
+    clear();
+    //emit changed(); doesn't work!?!
+  } else
+    ASSERT(0, "QtElementList::recieveNotification() - we are not enlisted to any other instance's channel.");
 }
 

src/UIElements/Views/Qt4/QtElementList.hpp

@@ -17 +17 @@
 #include <QtGui/QTreeWidget>
 #include "CodePatterns/Observer/Observer.hpp"
+#include "CodePatterns/Observer/Notification.hpp"
 
 class molecule;
@@ -31 +32 @@
 protected:
   virtual void update(Observable *publisher);
+  virtual void recieveNotification(Observable *publisher, Notification_ptr notification);
   virtual void subjectKilled(Observable *publisher);
   virtual void paintEvent(QPaintEvent * event);