Changeset 7cf0eb for src/UIElements

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:

e25448

Parents:

4ab5dc

git-author:

Frederik Heber <heber@…> (10/16/15 08:58:31)

git-committer:

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

Message:

FIX: GLWorldScene has additional moleculePrepared... slots and signals.

• i.e. we first insert into MoleculesInMap via direct connection and then signal is emitted (queued) to construct the actual GLMoleculeObject_molecule.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (5 diffs)
• GLWorldScene.hpp (modified) (2 diffs)
• GLWorldView.cpp (modified) (1 diff)

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

@@ -90 +90 @@
     GLMoleculeObject::meshCylinder[i]->setOption(QGLSceneNode::CullBoundingBox, true);
   }
+  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()));
@@ -217 +219 @@
 }
 
-/** Inserts a molecule into the scene.
+/** Prepres insertion of a molecule into the scene.
+ *
+ * This function takes up the insertion information, i.e. a molecule has been
+ * inserted and its id, and takes some immediate action (writing id into a map).
+ * But the request is then transmitted indirectly (i.e. not necessarily being
+ * processed in the same thread). Hence, we first take the request via a direction
+ * connection in the thread where the actual World::createMolecule() was called.
+ * However, the creation of the visual representation must occur in the thread
+ * who also contains GLWorldScene and GLWorldView and all further parents.
+ *
+ * That's the reason why we split here into moleculePrepareInserted and
+ * moleculeInserted.
  *
  * @param _mol molecule to insert
  */
-void GLWorldScene::moleculeInserted(const moleculeId_t _id)
-{
-  LOG(3, "INFO: GLWorldScene: Received signal moleculeInserted for molecule "+toString(_id)+".");
+void GLWorldScene::moleculePrepareInserted(const moleculeId_t _id)
+{
+  LOG(3, "INFO: GLWorldScene: Received signal moleculePrepareInserted for molecule "+toString(_id)+".");
+
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
+
   MoleculeNodeMap::const_iterator iter = MoleculesinSceneMap.find(_id);
   ASSERT( iter == MoleculesinSceneMap.end(),
       "GLWorldScene::moleculeInserted() - molecule's id "+toString(_id)+" already present.");
+
+  emit moleculePreparedInserted(_id);
+}
+
+/** Inserts a molecule into the scene.
+ *
+ * \sa moleculePrepareInserted()
+ *
+ * @param _mol molecule to insert
+ */
+void GLWorldScene::moleculeInserted(const moleculeId_t _id)
+{
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
 
   // check whether molecule is still present
@@ -233 +262 @@
     return;
   }
-  if (const_cast<const World &>(World::getInstance()).getMolecule(MoleculeById(_id)) == NULL)
+  if (const_cast<const World &>(World::getInstance()).getMolecule(MoleculeById(_id)) == NULL) {
+    ELOG(2, "Molecule with id " << _id << " has disappeared.");
     return;
+  }
 
   // add new object
@@ -319 +350 @@
 }
 
-/** Removes a molecule from the scene.
+/** Prepares removing a molecule from the scene.
+ *
+ * \sa moleculePrepareInserted()
  *
  * @param _id id of molecule to remove
  */
-void GLWorldScene::moleculeRemoved(const moleculeId_t _id)
-{
-  LOG(3, "INFO: GLWorldScene: Received signal moleculeRemoved for molecule "+toString(_id)+".");
+void GLWorldScene::moleculePrepareRemoved(const moleculeId_t _id)
+{
+  LOG(3, "INFO: GLWorldScene: Received signal moleculePrepareRemoved for molecule "+toString(_id)+".");
+
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
+
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_id);
   if ( iter == MoleculesinSceneMap.end())
     RemovalMolecules.insert(_id);
-  else {
-
-    GLMoleculeObject_molecule *molObject = iter->second;
-    molObject->disconnect();
-    MoleculesinSceneMap.erase(iter);
-    delete molObject;
+
+  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;
 
   // remove any possible state changes left
@@ -342 +391 @@
   }
 
-    emit changed();
-    emit changeOccured();
-  }
+  emit changed();
+  emit changeOccured();
 }
 

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

@@ -82 +82 @@
   void hoverChanged(const atomId_t);
   void hoverChanged(const moleculeId_t, int);
+  void moleculePreparedInserted(const moleculeId_t _id);
+  void moleculePreparedRemoved(const moleculeId_t _id);
 
 private slots:
   void atomClicked(atomId_t no);
   void moleculeClicked(moleculeId_t no);
+  void moleculePrepareRemoved(const moleculeId_t _id);
+  void moleculePrepareInserted(const moleculeId_t _id);
   void moleculeRemoved(const moleculeId_t _id);
   void moleculeInserted(const moleculeId_t _id);
@@ -116 +120 @@
   MoleculeNodeMap MoleculesinSceneMap;
   ShapeNodeMap ShapesinSceneMap;
+  //!> flag to indicate whether state map is currently worked on
+  boost::recursive_mutex MoleculeinSceneMap_mutex;
 
   //!> enumeration of all possible changes molecule might have missed before instantiation

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

@@ -92 +92 @@
   connect(this, SIGNAL(atomRemoved(const moleculeId_t, const atomId_t)), worldscene, SLOT(atomRemoved(const moleculeId_t, const atomId_t)), Qt::DirectConnection);
   connect(this, SIGNAL(atomInserted(const moleculeId_t, const atomId_t)), worldscene, SLOT(atomInserted(const moleculeId_t, const atomId_t)), Qt::DirectConnection);
-  connect(this, SIGNAL(moleculeInserted(const moleculeId_t)), worldscene, SLOT(moleculeInserted(const moleculeId_t)), Qt::DirectConnection);
-  connect(this, SIGNAL(moleculeRemoved(const moleculeId_t)), worldscene, SLOT(moleculeRemoved(const moleculeId_t)), Qt::DirectConnection);
+  connect(this, SIGNAL(moleculeInserted(const moleculeId_t)), worldscene, SLOT(moleculePrepareInserted(const moleculeId_t)), Qt::DirectConnection);
+  connect(this, SIGNAL(moleculeRemoved(const moleculeId_t)), worldscene, SLOT(moleculePrepareRemoved(const moleculeId_t)), Qt::DirectConnection);
   //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
   connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));