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

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

@@ -91 +91 @@
   }
   connect(this, SIGNAL(moleculePreparedInserted(const moleculeId_t)), this, SLOT(moleculeInserted(const moleculeId_t)));
-  connect(this, SIGNAL(moleculePreparedRemoved(const moleculeId_t)), this, SLOT(moleculeRemoved(const moleculeId_t)));
 
 //  connect(this, SIGNAL(updated()), this, SLOT(update()));
@@ -116 +115 @@
 //      moliter != molecules.end();
 //      moliter++) {
+//    boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
 //    // check whether molecule already exists
 //    const moleculeId_t molid = (*moliter)->getId();
@@ -123 +123 @@
 //  }
 //
+//  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
 //  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.begin();
 //  for (;iter != MoleculesinSceneMap.end();) {
@@ -182 +183 @@
 void GLWorldScene::atomInserted(const moleculeId_t _molid, const atomId_t _atomid)
 {
+  boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
+
   LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_atomid)+".");
-
-  boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
 
   // check of molecule is already present
@@ -268 +269 @@
 
   // add new object
+  LOG(1, "DEBUG: Adding GLMoleculeObject_molecule to id " << _id);
   GLMoleculeObject_molecule *molObject =
       new GLMoleculeObject_molecule(GLMoleculeObject::meshEmpty, this, _id);
@@ -344 +346 @@
   connect (molObject, SIGNAL(hoverChanged(const atomId_t)), this, SIGNAL(hoverChanged(const atomId_t)));
   connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
-  connect (molObject, SIGNAL(indexChanged(GLMoleculeObject_molecule *, const moleculeId_t, const moleculeId_t)), this, SLOT(changeMoleculeId(GLMoleculeObject_molecule *, const moleculeId_t, const moleculeId_t)));
+  connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
+  connect (molObject, SIGNAL(InstanceRemoved(const moleculeId_t)), this, SLOT(moleculeRemoved(const moleculeId_t)));
 
   emit changed();
@@ -350 +353 @@
 }
 
-/** Prepares removing a molecule from the scene.
- *
- * \sa moleculePrepareInserted()
+/** Removes a molecule from the scene.
+ *
+ * * \sa moleculePrepareRemoved()
  *
  * @param _id id of molecule to remove
  */
-void GLWorldScene::moleculePrepareRemoved(const moleculeId_t _id)
+void GLWorldScene::moleculeRemoved(const moleculeId_t _id)
 {
   LOG(3, "INFO: GLWorldScene: Received signal moleculePrepareRemoved for molecule "+toString(_id)+".");
@@ -363 +366 @@
 
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_id);
-  if ( iter == MoleculesinSceneMap.end())
+  if ( iter == MoleculesinSceneMap.end()) {
     RemovalMolecules.insert(_id);
-
-  emit moleculePreparedRemoved(_id);
-}
-
-/** Removes a molecule from the scene.
- *
- * * \sa moleculePrepareRemoved()
- *
- * @param _id id of molecule to remove
- */
-void GLWorldScene::moleculeRemoved(const moleculeId_t _id)
-{
-  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
-
-  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_id);
-  GLMoleculeObject_molecule *molObject = iter->second;
-  molObject->disconnect();
-  MoleculesinSceneMap.erase(iter);
-  delete molObject;
+  } else {
+    LOG(1, "DEBUG: Removing GLMoleculeObject_molecule to id " << _id);
+    GLMoleculeObject_molecule *molObject = iter->second;
+    molObject->disconnect();
+    MoleculesinSceneMap.erase(iter);
+    delete molObject;
+  }
 
   // remove any possible state changes left
@@ -397 +388 @@
 void GLWorldScene::moleculesVisibilityChanged(const moleculeId_t _id, bool _visible)
 {
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_id);
   ASSERT( iter != MoleculesinSceneMap.end(),
@@ -506 +498 @@
 
   {
+    boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
     // Remove from map.
     MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(oldId);
@@ -525 +518 @@
 
   {
+    boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
     // Remove and re-insert from map if present.
     MoleculeMissedStateMap_t::iterator iter = MoleculeMissedStateMap.find(oldId);
@@ -537 +531 @@
 void GLWorldScene::AtomSelected(const moleculeId_t _molid, const atomId_t _id)
 {
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
   if (iter != MoleculesinSceneMap.end())
@@ -550 +545 @@
 void GLWorldScene::AtomUnselected(const moleculeId_t _molid, const atomId_t _id)
 {
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
   if (iter != MoleculesinSceneMap.end())
@@ -563 +559 @@
 void GLWorldScene::MoleculeSelected(const moleculeId_t _molid)
 {
-  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
+MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
   if (iter != MoleculesinSceneMap.end())
     QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
@@ -575 +572 @@
 void GLWorldScene::MoleculeUnselected(const moleculeId_t _molid)
 {
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
   if (iter != MoleculesinSceneMap.end())