Changeset 7c7c4a for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp

Timestamp:

Feb 12, 2016, 11:15:04 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:

2831b3

Parents:

e25448

git-author:

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

git-committer:

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

Message:

FIX: All ObservedValue's of GLMoleculeObject_atom/bond/molecule wrapped into vector.

• the idea is that a GLMoleculeObject may only remove itself _after_ each and every contained Observer has gotten the subjectKilled() signal from the Observables. Only then will destroying the Object and its members thereby not cause any signOff() which try to access Observables or their channels which are no longer present. This can be imagined as a graph where we have to start destroying object at the very bottom.
• This is the avoid the following conflict: A superior object gets note of a molecule to be removed. It sends the visual representation a signal to remove itself, which causes it to use signOff(). On a parallel track (in another thread) we have the observed object calling subjectKilled() to inform any Observer about its immediate destruction. These two tracks collide. Now, we let first pass all subjectKilled() and when the last Observable has gotten its signal, we begin destroying the visual rep.
• rerouted signal/slots accordingly.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp (modified) (9 diffs)

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

@@ -57 +57 @@
 #include "World.hpp"
 
+#include "ObservedValue_wCallback.hpp"
+
 
 // static entities
@@ -82 +84 @@
   bondowner(getAtom(leftatomId)->getBond(getAtom(rightatomId)).get()),
   BondSide(side),
-  leftPosition(
-      leftowner,
-      boost::bind(&GLMoleculeObject_bond::updateLeftPosition, this),
-      "BondleftPosition_"+toString(leftatomId),
-      updateLeftPosition(),
-      BondPositionChannels),
-  rightPosition(
-      rightowner,
-      boost::bind(&GLMoleculeObject_bond::updateRightPosition, this),
-      "BondrightPosition_"+toString(rightatomId),
-      updateRightPosition(),
-      BondPositionChannels),
-  leftElement(
-      leftowner,
-      boost::bind(&GLMoleculeObject_bond::updateLeftElement, this),
-      "BondleftElement"+toString(leftatomId),
-      updateLeftElement(),
-      BondElementChannels),
-  rightElement(
-      rightowner,
-      boost::bind(&GLMoleculeObject_bond::updateRightElement, this),
-      "BondrightElement"+toString(rightatomId),
-      updateRightElement(),
-      BondElementChannels),
-  Degree(
-      bondowner,
-      boost::bind(&GLMoleculeObject_bond::updateDegree, this),
-      "BondDegree"+toString(leftatomId)+"_"+toString(rightatomId),
-      updateDegree(),
-      BondDegreeChannels),
+  ObservedValues(MAX_ObservedTypes),
+  subjectKilledCount(0),
   leftobservable_enabled(false),
   rightobservable_enabled(false)
 {
+  initObservedValues();
+
   // sign on as observer (obtain non-const instance before)
   bondowner->signOn(this, BondObservable::BondRemoved);
@@ -141 +117 @@
   // signOff() if not already done
   removeChannels();
+  destroyObservedValues();
 }
 
@@ -170 +147 @@
 }
 
-void GLMoleculeObject_bond::removeMe()
-{
-  // sign off
-  emit BondRemoved(leftatomId, rightatomId);
-}
-
 void GLMoleculeObject_bond::update(Observable *publisher)
 {
@@ -185 +156 @@
   // we signOff from all other sources
   removeChannels();
-  // then indicate to remove us
-  removeMe();
+  // check whether we should be removed
+  countsubjectKilled();
 }
 
@@ -278 +249 @@
 void GLMoleculeObject_bond::resetElement()
 {
-  size_t elementno = rightElement.get();
+  size_t elementno = getrightElement();
   QGLMaterial *elementmaterial = getMaterial(elementno);
   setMaterial(elementmaterial);
@@ -285 +256 @@
 void GLMoleculeObject_bond::resetWidth()
 {
-  const double factor = 1.0f+.5f*(Degree.get()-1);
+  const double factor = 1.0f+.5f*(getDegree()-1);
   LOG(2, "DEBUG: GLMoleculeObject_bond::resetWidth() - setting bond's width to " << factor << ".");
   setScaleX(factor);
@@ -295 +266 @@
 void GLMoleculeObject_bond::resetPosition()
 {
-  Vector Position = leftPosition.get();
-  Vector OtherPosition = rightPosition.get();
+  Vector Position = getleftPosition();
+  Vector OtherPosition = getrightPosition();
   const double distance =
       Position.distance(OtherPosition)/2.;
@@ -346 +317 @@
   return _atom;
 }
+
+void GLMoleculeObject_bond::countsubjectKilled()
+{
+  ++subjectKilledCount;
+
+  if (subjectKilledCount > ObservedValues.size())
+    emit BondRemoved(leftatomId, rightatomId);
+}
+
+void GLMoleculeObject_bond::initObservedValues()
+{
+  // fill ObservedValues
+  boost::function<void()> subjectKilled =
+      boost::bind(&GLMoleculeObject_bond::countsubjectKilled, this);
+  ObservedValues[leftPosition] = new ObservedValue_wCallback<Vector>(
+      leftowner,
+      boost::bind(&GLMoleculeObject_bond::updateLeftPosition, this),
+      "BondleftPosition_"+toString(leftatomId),
+      updateLeftPosition(),
+      BondPositionChannels,
+      subjectKilled);
+  ObservedValues[rightPosition] = new ObservedValue_wCallback<Vector>(
+      rightowner,
+      boost::bind(&GLMoleculeObject_bond::updateRightPosition, this),
+      "BondrightPosition_"+toString(rightatomId),
+      updateRightPosition(),
+      BondPositionChannels,
+      subjectKilled);
+  ObservedValues[leftElement] = new ObservedValue_wCallback<atomicNumber_t>(
+      leftowner,
+      boost::bind(&GLMoleculeObject_bond::updateLeftElement, this),
+      "BondleftElement"+toString(leftatomId),
+      updateLeftElement(),
+      BondElementChannels,
+      subjectKilled);
+  ObservedValues[rightElement] = new ObservedValue_wCallback<atomicNumber_t>(
+      rightowner,
+      boost::bind(&GLMoleculeObject_bond::updateRightElement, this),
+      "BondrightElement"+toString(rightatomId),
+      updateRightElement(),
+      BondElementChannels,
+      subjectKilled);
+  ObservedValues[Degree] = new ObservedValue_wCallback<int>(
+      bondowner,
+      boost::bind(&GLMoleculeObject_bond::updateDegree, this),
+      "BondDegree"+toString(leftatomId)+"_"+toString(rightatomId),
+      updateDegree(),
+      BondDegreeChannels,
+      subjectKilled);
+}
+
+void GLMoleculeObject_bond::destroyObservedValues()
+{
+  delete boost::any_cast<ObservedValue_wCallback<Vector> *>(ObservedValues[leftPosition]);
+  delete boost::any_cast<ObservedValue_wCallback<Vector> *>(ObservedValues[rightPosition]);
+  delete boost::any_cast<ObservedValue_wCallback<atomicNumber_t> *>(ObservedValues[leftElement]);
+  delete boost::any_cast<ObservedValue_wCallback<atomicNumber_t> *>(ObservedValues[rightElement]);
+  delete boost::any_cast<ObservedValue_wCallback<int> *>(ObservedValues[Degree]);
+  ObservedValues.clear();
+}
+
+Vector GLMoleculeObject_bond::getleftPosition() const
+{
+  return boost::any_cast<ObservedValue_wCallback<Vector> *>(ObservedValues[leftPosition])->get();
+}
+
+Vector GLMoleculeObject_bond::getrightPosition() const
+{
+  return boost::any_cast<ObservedValue_wCallback<Vector> *>(ObservedValues[rightPosition])->get();
+}
+
+atomicNumber_t GLMoleculeObject_bond::getleftElement() const
+{
+  return boost::any_cast<ObservedValue_wCallback<atomicNumber_t> *>(ObservedValues[leftElement])->get();
+}
+
+atomicNumber_t GLMoleculeObject_bond::getrightElement() const
+{
+  return boost::any_cast<ObservedValue_wCallback<atomicNumber_t> *>(ObservedValues[rightElement])->get();
+}
+
+int GLMoleculeObject_bond::getDegree() const
+{
+  return boost::any_cast<ObservedValue_wCallback<int> *>(ObservedValues[Degree])->get();
+}