Changeset efeeb7 for src/UIElements

Timestamp:

Apr 25, 2016, 7:05:31 AM (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:

1eba7c

Parents:

649f59

git-author:

Frederik Heber <heber@…> (04/17/16 21:26:58)

git-committer:

Frederik Heber <heber@…> (04/25/16 07:05:31)

Message:

GLWorldScene now holds onto atoms and bonds until ..Removed() signal and parent(s) is reset.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (14 diffs)
• GLWorldScene.hpp (modified) (4 diffs)

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

@@ -73 +73 @@
 
 using namespace MoleCuilder;
+
+// static functions
+
+static void eraseBondNodeParents(
+    std::vector<GLWorldScene::BondNodeParentMap_t> &_BondNodeParentMaps,
+    const ObservedValue_Index_t &_bondid)
+{
+  const size_t left_erased = _BondNodeParentMaps[0].left.erase(_bondid);
+  const size_t right_erased = _BondNodeParentMaps[1].left.erase(_bondid);
+  ASSERT( (left_erased == 1) && (right_erased == 1),
+      "eraseBondNodeParents() - could not erase both parents of "+toString(_bondid)+"?");
+}
+
+/** Checks whether both parents of the bond are set to GLWorldScene and the
+ * bondRemoved() signals was received for this bond.
+ *
+ * \param _BondNodeParent_Maps - map containing parents
+ * \param _ToBeRemovedNodes - set with all bonds that are to be removed
+ * \param _bondid id of bond
+ * \return true - both parents are assigned to GLWorldScene, false - else
+ */
+static bool checkBondRemoval(
+    const std::vector<GLWorldScene::BondNodeParentMap_t> &_BondNodeParentMaps,
+    const GLWorldScene::ToBeRemovedNodes_t &_ToBeRemovedNodes,
+    const ObservedValue_Index_t &_bondid)
+{
+  GLWorldScene::BondNodeParentMap_t::left_const_iterator leftiter =
+      _BondNodeParentMaps[0].left.find(_bondid);
+  GLWorldScene::BondNodeParentMap_t::left_const_iterator rightiter =
+      _BondNodeParentMaps[1].left.find(_bondid);
+  ASSERT( leftiter != _BondNodeParentMaps[0].left.end(),
+      "checkBondRemoval() - left parent to index "+toString(_bondid)+" missing?");
+  ASSERT( rightiter != _BondNodeParentMaps[1].left.end(),
+      "checkBondRemoval() - right parent to index "+toString(_bondid)+" missing?");
+  return ((leftiter->second == (ObservedValue_Index_t)NULL)
+      && (rightiter->second == (ObservedValue_Index_t)NULL)
+      && (_ToBeRemovedNodes.count(_bondid)));
+}
+
+void removeBondFromScene(
+    GLWorldScene::BondNodeMap &_BondsinSceneMap,
+    const ObservedValue_Index_t &_bondid)
+{
+  std::pair<GLWorldScene::BondNodeMap::iterator, GLWorldScene::BondNodeMap::iterator> iters =
+      _BondsinSceneMap.equal_range(_bondid);
+  ASSERT( iters.first != iters.second,
+      "removeBondFromScene() - could not find bond to id "+toString(_bondid));
+  for (GLWorldScene::BondNodeMap::iterator iter = iters.first; iter != iters.second; ++iter) {
+    GLMoleculeObject_bond *bondObject = iter->second;
+    delete bondObject; // is done by signal from bond itself
+    //LOG(4, "INFO: Still present bonds " << BondsinSceneMap << ".");
+  }
+  _BondsinSceneMap.erase(_bondid);
+}
+
+static bool checkAtomRemoval(
+    const GLWorldScene::AtomNodeParentMap_t &_AtomNodeParentMap,
+    const GLWorldScene::ToBeRemovedNodes_t &_ToBeRemovedNodes,
+    const ObservedValue_Index_t &_atomid)
+{
+  GLWorldScene::AtomNodeParentMap_t::left_const_iterator iter = _AtomNodeParentMap.left.find(_atomid);
+  ASSERT( iter != _AtomNodeParentMap.left.end(),
+      "checkAtomRemoval() - missing parent entry for "+toString(_atomid));
+  return ((iter->second == (ObservedValue_Index_t)NULL) && (_ToBeRemovedNodes.count(_atomid)));
+}
+
+// class definitions
 
 GLWorldScene::GLWorldScene(
@@ -238 +305 @@
     GLWorldScene::ObservedValueIndexLookup_t &_ObservedValueIndexLookup,
     T &_ObservedValues,
-    ObservedValue_Index_t _id)
+    const ObservedValue_Index_t &_id)
 {
   // get QObject* from lookup
@@ -244 +311 @@
       _ObservedValueIndexLookup.find(_id);
   ASSERT( iter != _ObservedValueIndexLookup.end(),
-      "GLWorldScene::removeAtom() - could not find index "+toString(_id)
+      "removeStoredObservedValue() - could not find index "+toString(_id)
       +" to stored observed value.");
   QObject * sender = iter->second;
   const size_t erased = _ObservedValues.erase(sender);
   ASSERT( erased == 1,
-      "GLWorldScene::removeStoredObservedValue() - could not erase stored observed value "
+      "removeStoredObservedValue() - could not erase stored observed value "
       +toString(_id));
   _ObservedValueIndexLookup.erase(iter);
 }
 
+void removeAtomFromScene(
+    GLWorldScene::AtomNodeMap &_AtomsinSceneMap,
+    const ObservedValue_Index_t &_atomid)
+{
+  GLWorldScene::AtomNodeMap::iterator iter = _AtomsinSceneMap.find(_atomid);
+  ASSERT(iter != _AtomsinSceneMap.end(),
+      "removeAtomFromScene() - atom "+toString(_atomid)+" not on display.");
+  GLMoleculeObject_atom *atomObject = iter->second;
+  _AtomsinSceneMap.erase(iter);
+  delete atomObject;
+}
+
+void GLWorldScene::checkAndRemoveAtom(const ObservedValue_Index_t &_atomid)
+{
+  boost::recursive_mutex::scoped_lock lock(AtomNodeParentMap_mutex);
+
+  if (checkAtomRemoval(AtomNodeParentMap, ToBeRemovedNodes, _atomid)) {
+    LOG(4, "DEBUG: Found parent of to be removed atom as GLWorldScene, removing.");
+    removeAtomFromScene(AtomsinSceneMap, _atomid);
+    AtomNodeParentMap.left.erase(_atomid);
+    ToBeRemovedNodes.erase(_atomid);
+    removeStoredObservedValue(ObservedValueIndexLookup, ObservedAtoms, _atomid);
+  }
+}
+
 /** Removes an atom.
  *
@@ -263 +355 @@
   // bonds are removed by signal coming from ~bond
 
+  ASSERT( ToBeRemovedNodes.count(_atomid) == 0,
+      "GLWorldScene::removeAtom() - removedAtom signal for id "+toString(_atomid)
+      +" came in twice?");
+  ToBeRemovedNodes.insert( _atomid );
+
   // remove atoms
-  {
-    AtomNodeMap::iterator iter = AtomsinSceneMap.find(_atomid);
-    ASSERT(iter != AtomsinSceneMap.end(),
-        "GLWorldScene::removeAtom() - atom "+toString(_atomid)+" not on display.");
-    GLMoleculeObject_atom *atomObject = iter->second;
-    AtomsinSceneMap.erase(iter);
-    delete atomObject;
-  }
-  {
-    boost::recursive_mutex::scoped_lock lock(AtomNodeParentMap_mutex);
-    AtomNodeParentMap_t::left_iterator iter = AtomNodeParentMap.left.find(_atomid);
-    ASSERT( iter != AtomNodeParentMap.left.end(),
-        "GLWorldScene::removeAtom() - missing parent entry for "+toString(_atomid));
-    if (iter->second == (ObservedValue_Index_t)NULL) {
-      LOG(4, "DEBUG: Found parent of atom as GLWorldScene, removing.");
-      removeStoredObservedValue(ObservedValueIndexLookup, ObservedAtoms, _atomid);
-    }
-    AtomNodeParentMap.left.erase(iter);
-  }
+  checkAndRemoveAtom( _atomid );
 
   emit changed();
@@ -297 +376 @@
 void GLWorldScene::connectBond(QtObservedBond::ptr _bond)
 {
-  connect(_bond.get(), SIGNAL(leftmoleculeChanged()), this, SLOT(reparentBondLeft()));
-  connect(_bond.get(), SIGNAL(rightmoleculeChanged()), this, SLOT(reparentBondRight()));
+  LOG(3, "INFO: GLWorldScene::connectBond() - connecting to bonds " << _bond->getBondIndex());
+
+  connect(_bond.get(), SIGNAL(leftmoleculeChanged()), this, SLOT(reparentBondLeft()), Qt::QueuedConnection);
+  connect(_bond.get(), SIGNAL(rightmoleculeChanged()), this, SLOT(reparentBondRight()), Qt::QueuedConnection);
 
   // store the object, as we need it on reparenting
@@ -381 +462 @@
 }
 
+void GLWorldScene::checkAndRemoveBond(const ObservedValue_Index_t &_bondid)
+{
+  if (checkBondRemoval(BondNodeParentMaps, ToBeRemovedNodes, _bondid)) {
+    LOG(3, "DEBUG: Found both parents of to be removed bond " << _bondid << " as GLWorldScene, removing.");
+    removeBondFromScene(BondsinSceneMap, _bondid);
+    removeStoredObservedValue(ObservedValueIndexLookup, ObservedBonds, _bondid);
+    eraseBondNodeParents(BondNodeParentMaps, _bondid);
+    ToBeRemovedNodes.erase(_bondid);
+  }
+}
+
 /** Removes a bond.
  *
@@ -387 +479 @@
 void GLWorldScene::removeBond(ObservedValue_Index_t _bondid)
 {
-  LOG(3, "INFO: GLWorldScene::removedBond() - Removing bond to id " << _bondid);
-
-  // left bond
-  {
-    std::pair<BondNodeMap::iterator, BondNodeMap::iterator> iters =
-        BondsinSceneMap.equal_range(_bondid);
-    ASSERT( iters.first != iters.second,
-        "GLWorldScene::removedBond() - could not find bond to id "+toString(_bondid));
-    for (BondNodeMap::iterator iter = iters.first; iter != iters.second; ++iter) {
-      GLMoleculeObject_bond *bondObject = iter->second;
-      delete bondObject; // is done by signal from bond itself
-      //LOG(4, "INFO: Still present bonds " << BondsinSceneMap << ".");
-    }
-    BondsinSceneMap.erase(_bondid);
-  }
-  {
-    boost::recursive_mutex::scoped_lock lock(BondNodeParentMap_mutex);
-    for (size_t i=0;i<2;++i) {
-      BondNodeParentMap_t::left_iterator iter = BondNodeParentMaps[i].left.find(_bondid);
-      ASSERT( iter != BondNodeParentMaps[i].left.end(),
-          "GLWorldScene::removeBond() - missing parent entry for "+toString(_bondid));
-      if (iter->second == (ObservedValue_Index_t)NULL) {
-        LOG(4, "DEBUG: Found parent of bond as GLWorldScene, removing.");
-        removeStoredObservedValue(ObservedValueIndexLookup, ObservedBonds, _bondid);
-      }
-      BondNodeParentMaps[i].left.erase(iter);
-    }
-  }
+  boost::recursive_mutex::scoped_lock lock(BondNodeParentMap_mutex);
+  LOG(3, "INFO: GLWorldScene::removedBond() - got bondRemoved signal from board for id " << _bondid);
+
+  ASSERT( ToBeRemovedNodes.find(_bondid) == ToBeRemovedNodes.end(),
+      "GLWorldScene::removeBond() - bondRemoved for "+toString(_bondid)+" obtained twice?");
+  ToBeRemovedNodes.insert( _bondid );
+
+  // check whether node has still non-NULL parents, otherwise remove completely
+  checkAndRemoveBond( _bondid );
 
   emit changed();
@@ -600 +673 @@
   boost::recursive_mutex::scoped_lock lock(AtomNodeParentMap_mutex);
   QObject * origin = sender();
+  if (origin == NULL) {
+    ELOG(1, "Got reparentAtom() with sender being NULL.");
+    return;
+  }
   ObservedAtoms_t::const_iterator iter = ObservedAtoms.find(origin);
   ASSERT( iter != ObservedAtoms.end(),
@@ -623 +700 @@
   // else atom does not yet exist
 
-  // check whether node is still shown, otherwise remove from lists completely
-  {
-    AtomNodeMap::iterator iter = AtomsinSceneMap.find(walkerid);
-    if (iter == AtomsinSceneMap.end()) {
-      LOG(3, "DEBUG: Reparented atom that is no longer on display, removing.");
-      removeStoredObservedValue(ObservedValueIndexLookup, ObservedAtoms, walkerid);
-    }
-  }
+  // check whether node is still shown, otherwise remove completely
+  checkAndRemoveAtom( walkerid );
 }
 
@@ -640 +711 @@
   boost::recursive_mutex::scoped_lock lock(BondNodeParentMap_mutex);
   QObject * origin = sender();
+  if (origin == NULL) {
+    ELOG(1, "Got reparentBondLeft() with sender being NULL.");
+    return;
+  }
   ObservedBonds_t::const_iterator iter = ObservedBonds.find(origin);
   ASSERT( iter != ObservedBonds.end(),
       "GLWorldScene::reparentBondLeft() - bond "+toString(origin)+" is no longer stored?");
   QtObservedBond::ptr bond = iter->second;
+  LOG(3, "INFO: GLWorldScene::reparentBondLeft() - Reparenting left side of bond "
+      << bond->getBondIndex() << ".");
   reparentBond(bond, bond->getLeftAtom(), GLMoleculeObject_bond::left);
 
-  // check whether node is still shown, otherwise remove from lists completely
-  {
-    const ObservedValue_Index_t bondid = bond->getIndex();
-    BondNodeMap::iterator iter = BondsinSceneMap.find(bondid);
-    if (iter == BondsinSceneMap.end()) {
-      // check whether both parents are now NULL
-      BondNodeParentMap_t::left_iterator leftiter = BondNodeParentMaps[0].left.find(bondid);
-      BondNodeParentMap_t::left_iterator rightiter = BondNodeParentMaps[1].left.find(bondid);
-      ASSERT( leftiter != BondNodeParentMaps[0].left.end(),
-          "GLWorldScene::reparentBondRight() - left parent to index "+toString(bondid)+" missing?");
-      ASSERT( rightiter != BondNodeParentMaps[1].left.end(),
-          "GLWorldScene::reparentBondRight() - right parent to index "+toString(bondid)+" missing?");
-      if ((leftiter->second == (ObservedValue_Index_t)NULL)
-          && (rightiter->second == (ObservedValue_Index_t)NULL)) {
-        LOG(3, "DEBUG: Reparented both left and right bond that is also no longer on display, removing.");
-        removeStoredObservedValue(ObservedValueIndexLookup, ObservedBonds, bondid);
-      }
-    }
-  }
+  // check whether node is still shown, otherwise remove completely
+  checkAndRemoveBond( bond->getIndex() );
 }
 
@@ -674 +734 @@
   boost::recursive_mutex::scoped_lock lock(BondNodeParentMap_mutex);
   QObject * origin = sender();
+  if (origin == NULL) {
+    ELOG(1, "Got reparentBondRight() with sender being NULL.");
+    return;
+  }
   ObservedBonds_t::const_iterator iter = ObservedBonds.find(origin);
   ASSERT( iter != ObservedBonds.end(),
       "GLWorldScene::reparentBondRight() - bond "+toString(origin)+" is no longer stored?");
   QtObservedBond::ptr bond = iter->second;
+  LOG(3, "INFO: GLWorldScene::reparentBondRight() - Reparenting right side of bond "
+      << bond->getBondIndex() << ".");
   reparentBond(bond, bond->getRightAtom(), GLMoleculeObject_bond::right);
 
-  // check whether node is still shown, otherwise remove from lists completely
-  {
-    const ObservedValue_Index_t bondid = bond->getIndex();
-    BondNodeMap::iterator iter = BondsinSceneMap.find(bondid);
-    if (iter == BondsinSceneMap.end()) {
-      // check whether both parents are now NULL
-      BondNodeParentMap_t::left_iterator leftiter = BondNodeParentMaps[0].left.find(bondid);
-      BondNodeParentMap_t::left_iterator rightiter = BondNodeParentMaps[1].left.find(bondid);
-      ASSERT( leftiter != BondNodeParentMaps[0].left.end(),
-          "GLWorldScene::reparentBondRight() - left parent to index "+toString(bondid)+" missing?");
-      ASSERT( rightiter != BondNodeParentMaps[1].left.end(),
-          "GLWorldScene::reparentBondRight() - right parent to index "+toString(bondid)+" missing?");
-      if ((leftiter->second == (ObservedValue_Index_t)NULL)
-          && (rightiter->second == (ObservedValue_Index_t)NULL)) {
-        LOG(3, "DEBUG: Reparented both left and right bond that is also no longer on display, removing.");
-        removeStoredObservedValue(ObservedValueIndexLookup, ObservedBonds, bondid);
-      }
-    }
-  }
+  // check whether node is still shown, otherwise remove completely
+  checkAndRemoveBond( bond->getIndex() );
 }
 
@@ -707 +756 @@
   std::pair<GLWorldScene::BondNodeMap::const_iterator, GLWorldScene::BondNodeMap::const_iterator> iters =
       BondsinSceneMap.equal_range(_bondid);
-  ASSERT( std::distance(iters.first, iters.second) == 2,
-      "GLWorldScene::getBondInScene() - not exactly two bonds of same id "
+  ASSERT( std::distance(iters.first, iters.second) >= 1,
+      "GLWorldScene::getBondInScene() - not at least one bond of id "
       +toString(_bondid)+" present in scene.");
   for (GLWorldScene::BondNodeMap::const_iterator bonditer = iters.first;
@@ -731 +780 @@
   const size_t dim = (_side == GLMoleculeObject_bond::left) ? 0 : 1;
   const ObservedValue_Index_t bondid = _bond->getIndex();
-  LOG(4, "DEBUG: GLWorldScene: Received signal moleculeChanged for bond "+toString(bondid)+".");
   BondNodeParentMap_t::left_iterator parentiter = BondNodeParentMaps[dim].left.find(bondid);
   ASSERT( parentiter != BondNodeParentMaps[dim].left.end(),
@@ -743 +791 @@
     BondNodeParentMaps[dim].left.insert( std::make_pair( bondid, (ObservedValue_Index_t)NULL) );
   parentiter = BondNodeParentMaps[dim].left.find(bondid);
+  LOG(3, "INFO: GLWorldScene::reparentBond() - Reparented bond "
+      << _bond->getBondIndex() << " to " << parentiter->second);
 
   // reset parent

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

@@ -135 +135 @@
       GLMoleculeObject_bond::SideOfBond _side) const;
 
+  void checkAndRemoveBond(const ObservedValue_Index_t &_bondid);
+
+  void checkAndRemoveAtom(const ObservedValue_Index_t &_atomid);
+
 public:
   void updateSelectedShapes();
@@ -142 +146 @@
 
   typedef std::map< ObservedValue_Index_t, QObject* > ObservedValueIndexLookup_t;
-
-private:
-
-  //!> id of atom hovered over
-  atomId_t hoverAtomId;
 
   typedef std::map< ObservedValue_Index_t, GLMoleculeObject_molecule* > MoleculeNodeMap;
@@ -163 +162 @@
       boost::bimaps::multiset_of< ObservedValue_Index_t >
   > BondNodeParentMap_t;
+
+  typedef std::set< ObservedValue_Index_t > ToBeRemovedNodes_t;
+
+private:
+
+  //!> id of atom hovered over
+  atomId_t hoverAtomId;
 
   //!> mutex to ascertain atomic access to NodeParentMaps
@@ -182 +188 @@
   ObservedValueIndexLookup_t ObservedValueIndexLookup;
 
+  //!> all atoms and bond id where we got the ...Removed signals for
+  ToBeRemovedNodes_t ToBeRemovedNodes;
+
   SelectionModeType selectionMode;