Changeset 89b992 for src

Timestamp:

Aug 9, 2013, 2:26:27 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:

d7e931

Parents:

2a8731

git-author:

Frederik Heber <heber@…> (07/11/13 19:28:02)

git-committer:

Frederik Heber <heber@…> (08/09/13 14:26:27)

Message:

GLWorldView now listens to World::TimeChanged() and updates view.

• GLMoleculeObject_atom also listen to World::TimeChanged, required such that positions are updated, too. (Bonds are re-created, hence automatically updated).

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (5 diffs)
• GLMoleculeObject_atom.hpp (modified) (1 diff)
• GLWorldView.cpp (modified) (6 diffs)

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

@@ -51 +51 @@
 #include "GLMoleculeObject_bond.hpp"
 #include "World.hpp"
+#include "WorldTime.hpp"
 
 GLMoleculeObject_atom::GLMoleculeObject_atom(QGLSceneNode *mesh[], QObject *parent, const atom *atomref) :
@@ -63 +64 @@
   atomref->signOn(this, AtomObservable::BondsAdded);
   World::getInstance().signOn(this, World::SelectionChanged);
+  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
 
   // set the object's id
@@ -81 +83 @@
   }
   World::getInstance().signOff(this, World::SelectionChanged);
+  WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
 }
 
@@ -189 +192 @@
         break;
     }
-  }else{
+  }else if (static_cast<World *>(publisher) == World::getPointer()) {
     // notification from world
 #ifdef LOG_OBSERVER
@@ -203 +206 @@
         break;
     }
+  } else {
+    // notification from world
+#ifdef LOG_OBSERVER
+    observerLog().addMessage() << "++ Update of Observer "<< observerLog().getName(static_cast<Observer *>(this))
+          << " received notification from Worldtime for channel "
+          << notification->getChannelNo() << ".";
+#endif
+    switch (notification->getChannelNo()) {
+      case WorldTime::TimeChanged:
+        resetPosition();
+        emit changed();
+        break;
+      default:
+        break;
+    }
   }
 }

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp

@@ -43 +43 @@
   void indexChanged(GLMoleculeObject_atom *ob, int oldId, int newId);
 
+public:
+  void resetPosition();
+
 private:
-  void resetPosition();
   void resetElement();
   void resetIndex();

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

@@ -62 +62 @@
 #include "Shapes/ShapeRegistry.hpp"
 #include "World.hpp"
+#include "WorldTime.hpp"
 
 GLWorldView::GLWorldView(QWidget *parent)
@@ -95 +96 @@
   World::getInstance().signOn(this, World::MoleculeRemoved);
   World::getInstance().signOn(this, World::SelectionChanged);
+  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
 
@@ -113 +115 @@
   World::getInstance().signOff(this, World::MoleculeRemoved);
   World::getInstance().signOff(this, World::SelectionChanged);
+  WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
   ShapeRegistry::getInstance().signOff(this);
@@ -354 +357 @@
       }
       default:
-        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for World.");
         break;
     }
-  } else if (dynamic_cast<AtomObservable *>(publisher) != NULL) {
+  } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+    switch (notification->getChannelNo()) {
+      case WorldTime::TimeChanged:
+      {
+#ifdef LOG_OBSERVER
+      observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that WorldTime's time has changed.";
+#endif
+        emit changed();
+        break;
+      }
+      default:
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for WorldTime.");
+        break;
+    }
+} else if (dynamic_cast<AtomObservable *>(publisher) != NULL) {
     switch (notification->getChannelNo()) {
       case AtomObservable::PositionChanged:
       {
+    #ifdef LOG_OBSERVER
         const atom *_atom = dynamic_cast<const atom *>(publisher);
-    #ifdef LOG_OBSERVER
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_atom->getId())+" has changed its position.";
     #endif
@@ -369 +386 @@
       }
       default:
-        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for AtomObservable.");
         break;
     }
@@ -390 +407 @@
       }
       default:
-        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for ShapeRegistry.");
         break;
     }