Changeset 7188b1 for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Oct 6, 2011, 4:06:10 PM (14 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:

db7e6d

Parents:

e638f9

git-author:

Frederik Heber <heber@…> (09/01/11 13:49:14)

git-committer:

Frederik Heber <heber@…> (10/06/11 16:06:10)

Message:

Introduced atom_observables and GLWorldView observes World, GLMoleculeObject_atom observes its atom.

Observer changes:

• new Channels pattern required from CodePatterns 1.1.5 and that Observable signing on and off is now with const instance possible.
• class atom is now observable, encapsulated in class AtomObservable:
  • enums have notification types
  • we use NotificationChannels of Observable to emit these distinct types.
• atominfo, particleinfo, bondedparticleinfo all have OBSERVE and NOTIFY(..) in their setter functions (thx encapsulation).
• class GLMoleculeObject_atom signs on to atom to changes to position, element, and index.
• World equally has notifications for atom (new,remove) and molecules (new, remove).
• GLWorldView now observes World for these changes.

Other changes:

• removed additional hierarchy level for GLWidget of molecules (i.e. GLMoleculeScene removed and incorporated into GLWorldScene).

File:

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

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

@@ -26 +26 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include "CodePatterns/Log.hpp"
+
+#include "World.hpp"
+
 GLWorldView::GLWorldView(QWidget *parent)
-   : QGLView(parent), worldscene(NULL)
+   : QGLView(parent), Observer("GLWorldView"), worldscene(NULL)
 {
    worldscene = new GLWorldScene(this);
@@ -34 +38 @@
 
    connect(worldscene, SIGNAL(changed()), this, SLOT(updateGL()));
+   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(changed()), this, SLOT(updateGL()));
+
+   // sign on to changes in the world
+   World::getInstance().signOn(this);
+   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
+   World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomRemoved));
 }
 
@@ -41 +53 @@
 }
 
+/**
+ * Update operation which can be invoked by the observable (which should be the
+ * change tracker here).
+ */
+void GLWorldView::update(Observable *publisher)
+{
+  emit changed();
+}
+
+/**
+ * The observable can tell when it dies.
+ */
+void GLWorldView::subjectKilled(Observable *publisher) {}
+
+/** Listen to specific changes to the world.
+ *
+ * @param publisher ref to observable.
+ * @param notification type of notification
+ */
+void GLWorldView::recieveNotification(Observable *publisher, Notification_ptr notification)
+{
+  switch (notification->getChannelNo()) {
+    case World::AtomInserted:
+    {
+      const atom *_atom = World::getInstance().lastChanged<atom>();
+      LOG(0, "GLWorldView: Received notification that atom "+toString(_atom->getId())+" has been inserted.");
+      emit atomInserted(_atom);
+      break;
+    }
+    case World::AtomRemoved:
+    {
+      const atom *_atom = World::getInstance().lastChanged<atom>();
+      LOG(0, "GLWorldView: Received notification that atom "+toString(_atom->getId())+" has been removed.");
+      emit atomRemoved(_atom);
+      break;
+    }
+    default:
+      ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here.");
+      break;
+  }
+}
 
 void GLWorldView::initializeGL(QGLPainter *painter)