Changeset 53059e for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Apr 11, 2012, 4:52:37 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:

3e93332

Parents:

c0ed1e (diff), 3927ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (04/06/12 11:59:28)

git-committer:

Frederik Heber <heber@…> (04/11/12 16:52:37)

Message:

Merge branch 'michi-track-molecules' into stable

Conflicts:

src/World.hpp

• World had removed NotificationType MoleculeChange but added SelectionChanged.
• FIX: World::AtomPositionChanged is no more, GLWorldView listens to AtomObserver instead.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (5 diffs)

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -26 +26 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include "Atom/AtomObserver.hpp"
+#include "Atom/atom_observable.hpp"
 #include "CodePatterns/Log.hpp"
 #include "CodePatterns/Observer/Notification.hpp"
@@ -42 +44 @@
   connect(this, SIGNAL(atomInserted(const atom *)), worldscene, SLOT(atomInserted(const atom *)));
   connect(this, SIGNAL(atomRemoved(const atom *)), worldscene, SLOT(atomRemoved(const atom *)));
+  connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
+  connect(this, SIGNAL(moleculeRemoved(const molecule *)), worldscene, SLOT(moleculeRemoved(const molecule *)));
   connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
 
@@ -48 +52 @@
   World::getInstance().signOn(this, World::AtomInserted);
   World::getInstance().signOn(this, World::AtomRemoved);
+  World::getInstance().signOn(this, World::MoleculeInserted);
+  World::getInstance().signOn(this, World::MoleculeRemoved);
+  World::getInstance().signOn(this, World::SelectionChanged);
+  AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
 }
 
@@ -55 +63 @@
   World::getInstance().signOff(this, World::AtomInserted);
   World::getInstance().signOff(this, World::AtomRemoved);
+  World::getInstance().signOff(this, World::MoleculeInserted);
+  World::getInstance().signOff(this, World::MoleculeRemoved);
+  World::getInstance().signOff(this, World::SelectionChanged);
+  AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
   delete worldscene;
 }
@@ -79 +91 @@
 void GLWorldView::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  switch (notification->getChannelNo()) {
-    case World::AtomInserted:
-    {
-      const atom *_atom = World::getInstance().lastChanged<atom>();
-#ifdef LOG_OBSERVER
-      observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has been inserted.";
-#endif
-      emit atomInserted(_atom);
-      break;
+  if (static_cast<World *>(publisher) == World::getPointer()) {
+    switch (notification->getChannelNo()) {
+      case World::AtomInserted:
+      {
+        const atom *_atom = World::getInstance().lastChanged<atom>();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has been inserted.";
+  #endif
+        emit atomInserted(_atom);
+        break;
+      }
+      case World::AtomRemoved:
+      {
+        const atom *_atom = World::getInstance().lastChanged<atom>();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has been removed.";
+  #endif
+        emit atomRemoved(_atom);
+        break;
+      }
+      case World::SelectionChanged:
+      {
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that selection has changed.";
+  #endif
+        emit worldSelectionChanged();
+        break;
+      }
+      case World::MoleculeInserted:
+      {
+        const molecule *_molecule = World::getInstance().lastChanged<molecule>();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that molecule "+toString(_molecule->getId())+" has been removed.";
+  #endif
+        emit moleculeInserted(_molecule);
+        break;
+      }
+      case World::MoleculeRemoved:
+      {
+        const molecule *_molecule = World::getInstance().lastChanged<molecule>();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that molecule "+toString(_molecule->getId())+" has been removed.";
+  #endif
+        emit moleculeRemoved(_molecule);
+        break;
+      }
+      default:
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+        break;
     }
-    case World::AtomRemoved:
-    {
-      const atom *_atom = World::getInstance().lastChanged<atom>();
-#ifdef LOG_OBSERVER
-      observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has been removed.";
-#endif
-      emit atomRemoved(_atom);
-      break;
+  } else if (dynamic_cast<AtomObservable *>(publisher) != NULL) {
+    switch (notification->getChannelNo()) {
+      case AtomObservable::PositionChanged:
+      {
+        const atom *_atom = dynamic_cast<const atom *>(publisher);
+    #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has changed its position.";
+    #endif
+        emit changed();
+        break;
+      }
+      default:
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+        break;
     }
-    default:
-      ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
-      break;
-  }
+  } else
+    ASSERT(0, "GLWorldView::recieveNotification() - received notification from unknown source.");
 }