Changeset 7c7c4a for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.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_atom.cpp (modified) (14 diffs)

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

@@ -57 +57 @@
 #include "WorldTime.hpp"
 
+#include "ObservedValue_wCallback.hpp"
+
 using namespace boost::assign;
 
@@ -80 +82 @@
   Observer(std::string("GLMoleculeObject_atom")+toString(_id)),
   atomref(getAtom(_id)),
-  AtomIndex(
-      atomref,
-      boost::bind(&GLMoleculeObject_atom::updateIndex, this),
-      "AtomIndex_"+toString(_id),
-      _id,
-      AtomIndexChannels),
-  AtomPosition(
-      atomref,
-      boost::bind(&GLMoleculeObject_atom::updatePosition, this),
-      "AtomPosition_"+toString(_id),
-      updatePosition(),
-      AtomPositionChannels),
-  AtomElement(
-      atomref,
-      boost::bind(&GLMoleculeObject_atom::updateElement, this),
-      "AtomElement"+toString(_id),
-      updateElement(),
-      AtomElementChannels),
-  AtomBonds(
-      atomref,
-      boost::bind(&GLMoleculeObject_atom::updateBonds, this),
-      "AtomBonds_"+toString(_id),
-      updateBonds(),
-      AtomBondsChannels),
+  ObservedValues(MAX_ObservedTypes),
+  subjectKilledCount(0),
   owner(NULL)
 {
+  initObservedValues(_id);
+
   setObjectId(_id);
   resetPosition();
@@ -154 +136 @@
 {
   deactivateObserver();
+  destroyObservedValues();
 }
 
 void GLMoleculeObject_atom::resetIndex()
 {
-  const atomId_t newId = AtomIndex.get();
+  const atomId_t newId = getAtomIndex();
   const size_t oldId = objectId();
   ASSERT( newId != oldId,
@@ -170 +153 @@
 void GLMoleculeObject_atom::resetPosition()
 {
-  const Vector Position = AtomPosition.get();
+  const Vector Position = getAtomPosition();
   LOG(4, "INFO: GLMoleculeObject_atom::resetIndex() - new position is "+toString(Position)+".");
   setPosition(QVector3D(Position[0], Position[1], Position[2]));
@@ -179 +162 @@
   size_t elementno = 0;
   const element * const _type = World::getInstance().
-      getPeriode()->FindElement(AtomElement.get());
+      getPeriode()->FindElement(getAtomElement());
   if (_type != NULL) {
     elementno = _type->getAtomicNumber();
@@ -205 +188 @@
 void GLMoleculeObject_atom::resetBonds()
 {
-  ListOfBonds_t ListOfBonds_new = AtomBonds.get();
+  ListOfBonds_t ListOfBonds_new = getAtomBonds();
   std::sort(ListOfBonds_new.begin(), ListOfBonds_new.end());
   ListOfBonds_t BondsToAdd;
@@ -220 +203 @@
       iter != BondsToAdd.end();
       ++iter) {
-    const GLMoleculeObject_bond::SideOfBond side = (iter->first == AtomIndex.get()) ?
+    const GLMoleculeObject_bond::SideOfBond side = (iter->first == getAtomIndex()) ?
         GLMoleculeObject_bond::left : GLMoleculeObject_bond::right;
     emit BondsAdded(iter->first, iter->second, side);
@@ -259 +242 @@
 void GLMoleculeObject_atom::wasClicked()
 {
-  LOG(4, "INFO: GLMoleculeObject_atom: atom " << AtomIndex.get() << " has been clicked");
-  emit clicked(AtomIndex.get());
+  LOG(4, "INFO: GLMoleculeObject_atom: atom " << getAtomIndex() << " has been clicked");
+  emit clicked(getAtomIndex());
 }
 
@@ -283 +266 @@
 Vector GLMoleculeObject_atom::updatePosition() const
 {
-  const atom * const _atom = getAtom(AtomIndex.get());
+  const atom * const _atom = getAtom(getAtomIndex());
   if (_atom != NULL) {
     return _atom->getPosition();
@@ -293 +276 @@
 atomicNumber_t GLMoleculeObject_atom::updateElement() const
 {
-  const atom * const _atom = getAtom(AtomIndex.get());
+  const atom * const _atom = getAtom(getAtomIndex());
   if (_atom != NULL) {
     return _atom->getElementNo();
@@ -304 +287 @@
 {
   ListOfBonds_t ListOfBonds;
-  const atom * const _atom = getAtom(AtomIndex.get());
+  const atom * const _atom = getAtom(getAtomIndex());
   if (_atom != NULL) {
     // make sure position is up-to-date
@@ -315 +298 @@
           (*iter)->rightatom->getId()) );
   } else {
-    ELOG(2, "Atom with id "+toString(AtomIndex.get())+" is already gone.");
+    ELOG(2, "Atom with id "+toString(getAtomIndex())+" is already gone.");
   }
   return ListOfBonds;
@@ -328 +311 @@
 {
   deactivateObserver();
+
+  countsubjectKilled();
 }
 
@@ -357 +342 @@
     ASSERT(0, "GLMoleculeObject_atom::recieveNotification() - received notification from unexpected source.");
 }
+
+void GLMoleculeObject_atom::countsubjectKilled()
+{
+  ++subjectKilledCount;
+
+  if (subjectKilledCount > ObservedValues.size())
+    emit InstanceRemoved(getAtomIndex());
+}
+
+void GLMoleculeObject_atom::initObservedValues(const atomId_t _id)
+{
+  // fill ObservedValues
+  boost::function<void()> subjectKilled =
+      boost::bind(&GLMoleculeObject_atom::countsubjectKilled, this);
+  ObservedValues[AtomIndex] = new ObservedValue_wCallback<atomId_t>(
+      atomref,
+      boost::bind(&GLMoleculeObject_atom::updateIndex, this),
+      "AtomIndex_"+toString(_id),
+      _id,
+      AtomIndexChannels,
+      subjectKilled);
+  ObservedValues[AtomPosition] = new ObservedValue_wCallback<Vector>(
+      atomref,
+      boost::bind(&GLMoleculeObject_atom::updatePosition, this),
+      "AtomPosition_"+toString(_id),
+      updatePosition(),
+      AtomPositionChannels,
+      subjectKilled);
+  ObservedValues[AtomElement] = new ObservedValue_wCallback<atomicNumber_t>(
+      atomref,
+      boost::bind(&GLMoleculeObject_atom::updateElement, this),
+      "AtomElement"+toString(_id),
+      updateElement(),
+      AtomElementChannels,
+      subjectKilled);
+  ObservedValues[AtomBonds] = new ObservedValue_wCallback<ListOfBonds_t>(
+      atomref,
+      boost::bind(&GLMoleculeObject_atom::updateBonds, this),
+      "AtomBonds_"+toString(_id),
+      updateBonds(),
+      AtomBondsChannels,
+      subjectKilled);
+}
+
+void GLMoleculeObject_atom::destroyObservedValues()
+{
+  delete boost::any_cast<ObservedValue_wCallback<atomId_t> *>(ObservedValues[AtomIndex]);
+  delete boost::any_cast<ObservedValue_wCallback<Vector> *>(ObservedValues[AtomPosition]);
+  delete boost::any_cast<ObservedValue_wCallback<atomicNumber_t> *>(ObservedValues[AtomElement]);
+  delete boost::any_cast<ObservedValue_wCallback<ListOfBonds_t> *>(ObservedValues[AtomBonds]);
+  ObservedValues.clear();
+}
+
+atomId_t GLMoleculeObject_atom::getAtomIndex() const
+{
+  return boost::any_cast<ObservedValue_wCallback<atomId_t> *>(ObservedValues[AtomIndex])->get();
+}
+
+Vector GLMoleculeObject_atom::getAtomPosition() const
+{
+  return boost::any_cast<ObservedValue_wCallback<Vector> *>(ObservedValues[AtomPosition])->get();
+}
+
+atomicNumber_t GLMoleculeObject_atom::getAtomElement() const
+{
+  return boost::any_cast<ObservedValue_wCallback<atomicNumber_t> *>(ObservedValues[AtomElement])->get();
+}
+
+GLMoleculeObject_atom::ListOfBonds_t GLMoleculeObject_atom::getAtomBonds() const
+{
+  return boost::any_cast<ObservedValue_wCallback<ListOfBonds_t> *>(ObservedValues[AtomBonds])->get();
+}