Changeset 136842 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:

649f59

Parents:

d16a06

git-author:

Frederik Heber <heber@…> (04/14/16 07:55:41)

git-committer:

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

Message:

GLWorldScene needs to store observed values to ensure duration of their lifetime.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -162 +162 @@
   connect(_atom.get(), SIGNAL(moleculeChanged()), this, SLOT(reparentAtom()));
 
+  // store the object, as we need it on reparenting
+#ifndef NDEBUG
+  std::pair< ObservedAtoms_t::iterator, bool > inserter =
+#endif
+      ObservedAtoms.insert( std::make_pair(_atom->getIndex(), _atom) );
+  ASSERT( inserter.second,
+      "GLWorldScene::connectAtom() - observed atom "+toString(_atom)+" already stored?");
+
   {
     const ObservedValue_Index_t atomid = _atom->getIndex();
@@ -228 +236 @@
 
   // 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;
+  {
+    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.left.erase(_atomid);
   }
+  {
+    const size_t erased = ObservedAtoms.erase(_atomid);
+    ASSERT( erased == 1,
+        "GLWorldScene::removeAtom() - could not erase stored observed value "+toString(_atomid));
+  }
   emit changed();
   emit changeOccured();
@@ -253 +268 @@
   connect(_bond.get(), SIGNAL(leftmoleculeChanged()), this, SLOT(reparentBondLeft()));
   connect(_bond.get(), SIGNAL(rightmoleculeChanged()), this, SLOT(reparentBondRight()));
+
+  // store the object, as we need it on reparenting
+#ifndef NDEBUG
+  std::pair< ObservedBonds_t::iterator, bool > inserter =
+#endif
+      ObservedBonds.insert( std::make_pair(_bond->getIndex(), _bond) );
+  ASSERT( inserter.second,
+      "GLWorldScene::connectBond() - observed bond "+toString(_bond)+" already stored?");
 
   {
@@ -328 +351 @@
 
   // 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);
+  {
+    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);
     BondNodeParentMaps[0].left.erase(_bondid);
     BondNodeParentMaps[1].left.erase(_bondid);
+  }
+  {
+    const size_t erased = ObservedAtoms.erase(_bondid);
+    ASSERT( erased == 1,
+        "GLWorldScene::removeBond() - could not erase stored observed value "+toString(_bondid));
   }
 

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

@@ -143 +143 @@
   atomId_t hoverAtomId;
 
-  typedef std::map< ObservedValue_Index_t , GLMoleculeObject_molecule* > MoleculeNodeMap;
+  typedef std::map< ObservedValue_Index_t, GLMoleculeObject_molecule* > MoleculeNodeMap;
   typedef std::map< ObservedValue_Index_t, GLMoleculeObject_atom* > AtomNodeMap;
   typedef std::multimap< ObservedValue_Index_t, GLMoleculeObject_bond* > BondNodeMap;
@@ -159 +159 @@
   > BondNodeParentMap_t;
 
+  typedef std::map< ObservedValue_Index_t, QtObservedAtom::ptr > ObservedAtoms_t;
+  typedef std::map< ObservedValue_Index_t, QtObservedBond::ptr > ObservedBonds_t;
+
   //!> mutex to ascertain atomic access to NodeParentMaps
   boost::recursive_mutex AtomNodeParentMap_mutex;
@@ -170 +173 @@
   std::vector<BondNodeParentMap_t> BondNodeParentMaps;
 
+  //!> stored observed atom such that its signals may always be safely evaluated
+  ObservedAtoms_t ObservedAtoms;
+  //!> stored observed bond such that its signals may always be safely evaluated
+  ObservedBonds_t ObservedBonds;
+
   SelectionModeType selectionMode;