Changeset 8d5fbf1 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp

Timestamp:

Feb 12, 2016, 11:15:06 PM (9 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:

0f7ffe

Parents:

47f0e4

git-author:

Frederik Heber <heber@…> (01/25/16 11:09:33)

git-committer:

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

Message:

GLMoleculeObject_atom, _bond, _molecule all use QtInstanceInformationBoard passed via GLWorldScene.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp (modified) (10 diffs)

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

@@ -53 +53 @@
 #include "Element/periodentafel.hpp"
 #include "LinearAlgebra/Vector.hpp"
-#include "GLMoleculeObject_bond.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp"
+#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
 #include "World.hpp"
 #include "WorldTime.hpp"
@@ -65 +66 @@
   Observable::channels_t channels;
   channels += AtomObservable::BondsAdded, AtomObservable::BondsRemoved;
+  return channels;
+}
+
+static const Observable::channels_t getAllObservedChannels()
+{
+  Observable::channels_t channels;
+  channels +=
+      AtomObservable::IndexChanged,
+      AtomObservable::PositionChanged,
+      AtomObservable::ElementChanged,
+      AtomObservable::BondsAdded,
+      AtomObservable::BondsRemoved;
   return channels;
 }
@@ -81 +94 @@
     QGLSceneNode *mesh[],
     QObject *parent,
-    const atomId_t _id) :
-  GLMoleculeObject(mesh, parent),
-  Observer(std::string("GLMoleculeObject_atom")+toString(_id)),
-  atomref(getAtom(_id)),
-  ObservedValues(MAX_ObservedTypes),
-  subjectKilledCount(0),
-  owner(NULL)
-{
-  boost::function<void(const atomId_t)> subjectKilled =
-      boost::bind(&GLMoleculeObject_atom::countsubjectKilled, this, _id);
-  initObservedValues(ObservedValues, _id, atomref, subjectKilled);
-
-  init(_id);
-}
-
-GLMoleculeObject_atom::GLMoleculeObject_atom(
-    QGLSceneNode *mesh[],
-    QObject *parent,
     const atomId_t _id,
+    QtInstanceInformationBoard * _board,
     std::vector<boost::any> _ObservedValues) :
   GLMoleculeObject(mesh, parent),
@@ -106 +102 @@
   ObservedValues(_ObservedValues),
   subjectKilledCount(0),
-  owner(NULL)
+  owner(NULL),
+  AllsignedOnChannels(getAllObservedChannels().size()),
+  signedOnChannels(0),
+  board(_board)
 {
   init(_id);
@@ -130 +129 @@
   connect( this, SIGNAL(positionChanged()), this, SLOT(resetPosition()), Qt::QueuedConnection);
   connect( this, SIGNAL(bondsChanged()), this, SLOT(resetPosition()), Qt::QueuedConnection);
+
+  // use that ObservedValues::AtomBonds is always up-to-date
+  resetBonds();
 }
 
@@ -135 +137 @@
 {
   if (atomref != NULL) {
+    Observable::channels_t channels = getAllObservedChannels();
     owner = static_cast<const Observable *>(atomref);
-    owner->signOn(this, AtomObservable::IndexChanged);
-    owner->signOn(this, AtomObservable::PositionChanged);
-    owner->signOn(this, AtomObservable::ElementChanged);
-    owner->signOn(this, AtomObservable::BondsAdded);
-    owner->signOn(this, AtomObservable::BondsRemoved);
+    for (Observable::channels_t::const_iterator iter = channels.begin();
+        iter != channels.end(); ++iter)
+      owner->signOn(this, *iter);
   }
 }
@@ -149 +150 @@
   // sign Off
   if (owner != NULL) {
-    owner->signOff(this, AtomObservable::IndexChanged);
-    owner->signOff(this, AtomObservable::PositionChanged);
-    owner->signOff(this, AtomObservable::ElementChanged);
-    owner->signOff(this, AtomObservable::BondsAdded);
-    owner->signOff(this, AtomObservable::BondsRemoved);
+    Observable::channels_t channels = getAllObservedChannels();
+    for (Observable::channels_t::const_iterator iter = channels.begin();
+        iter != channels.end(); ++iter)
+      owner->signOff(this, *iter);
     owner = NULL;
+    signedOnChannels = 0;
   }
 }
@@ -161 +162 @@
 {
   deactivateObserver();
-  destroyObservedValues(ObservedValues);
+  board->returnAtomObservedValues(getAtomIndex(), ObservedValues);
 }
 
@@ -338 +339 @@
 void GLMoleculeObject_atom::subjectKilled(Observable *publisher)
 {
-  deactivateObserver();
-
-  countsubjectKilled(getAtomIndex());
+  ++signedOnChannels;
+
+  if (signedOnChannels == AllsignedOnChannels) {
+    // remove owner: no more signOff needed
+    owner = NULL;
+
+    board->atomcountsubjectKilled(getAtomIndex());
+  }
 }
 
@@ -371 +377 @@
 }
 
-void GLMoleculeObject_atom::countsubjectKilled(const atomId_t)
-{
-  ++subjectKilledCount;
-
-  if (subjectKilledCount > ObservedValues.size())
-    emit InstanceRemoved(getAtomIndex());
-}
-
 void GLMoleculeObject_atom::initObservedValues(
     std::vector<boost::any> &_ObservedValues,