Changeset bcf9cd for src/UIElements

Timestamp:

Feb 26, 2016, 9:46:18 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:

96e145

Parents:

23221f

git-author:

Frederik Heber <heber@…> (01/27/16 21:24:07)

git-committer:

Frederik Heber <heber@…> (02/26/16 09:46:18)

Message:

GLWorldScene places GLMoleculeObject_molecule into extra list before removal.

• GLMoleculeObject_molecule sends signal when no atoms are left.
• GLMoleculeObject_molecule is destroyed when signal is obtained and we have placed it in removal list before.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_molecule.cpp (modified) (1 diff)
• GLMoleculeObject_molecule.hpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (3 diffs)
• GLWorldScene.hpp (modified) (2 diffs)

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

@@ -419 +419 @@
   delete atomObject;
 
+  if (AtomsinSceneMap.empty())
+    emit moleculeEmptied(ObservedMolecule->getMolIndex());
+
   emit changed();
   emit changeOccured();

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

@@ -71 +71 @@
   void atomClicked(atomId_t no);
   void moleculeClicked(moleculeId_t no);
+  void moleculeEmptied(moleculeId_t no);
   void IsSelectedChanged();
 

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

@@ -398 +398 @@
   connect (molObject, SIGNAL(atomClicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
   connect (molObject, SIGNAL(moleculeClicked(moleculeId_t)), this, SLOT(moleculeClicked(moleculeId_t)));
+  connect (molObject, SIGNAL(moleculeEmptied(moleculeId_t)), this, SLOT(moleculeEmpty(moleculeId_t)));
   connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
   connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
@@ -426 +427 @@
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_id);
   if ( iter != MoleculesinSceneMap.end()) {
-    LOG(1, "DEBUG: Removing GLMoleculeObject_molecule to id " << _id);
+    LOG(1, "DEBUG: Removing GLMoleculeObject_molecule to id " << _id << " from scene.");
+    RemovedMolecules.insert( std::make_pair(_id, iter->second) );
+    MoleculesinSceneMap.erase(iter);
+  }
+
+  // remove any possible state changes left
+  {
+    boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
+    MoleculeMissedStateMap.erase(_id);
+  }
+}
+
+void GLWorldScene::moleculeEmpty(const moleculeId_t _id)
+{
+  LOG(3, "INFO: GLWorldScene: Received signal moleculeEmpty for molecule "+toString(_id)+".");
+
+  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
+
+  MoleculeNodeMap::iterator iter = RemovedMolecules.find(_id);
+  if ( iter != RemovedMolecules.end()) {
+    LOG(1, "DEBUG: Deleting GLMoleculeObject_molecule to id " << _id);
     GLMoleculeObject_molecule *molObject = iter->second;
+    RemovedMolecules.erase(iter);
     molObject->disconnect();
-    MoleculesinSceneMap.erase(iter);
     delete molObject;
+  } else {
+    ASSERT(0,
+        "GLWorldScene::moleculeEmpty() - molecule "+toString(_id)+" is empty that is not present.");
   }
 
@@ -478 +502 @@
           +toString(_newid)+" already present in MoleculesinSceneMap.");
 #endif
-      LOG(1, "DEBUG: Changing GLMoleculeObject_molecule from " << _oldid << " to id " << _newid);
+      LOG(1, "DEBUG: Changing GLMoleculeObject_molecule in MoleculesinSceneMapfrom "
+          << _oldid << " to id " << _newid);
       GLMoleculeObject_molecule* const molObject = olditer->second;
       MoleculesinSceneMap.erase(olditer);
       MoleculesinSceneMap[_newid] = molObject;
+    }
+  }
+  {
+    MoleculeNodeMap::iterator const olditer = RemovedMolecules.find(_oldid);
+    if ( olditer != RemovedMolecules.end()) {
+#ifndef NDEBUG
+      MoleculeNodeMap::iterator const newiter = RemovedMolecules.find(_newid);
+      ASSERT ( newiter == RemovedMolecules.end(),
+          "GLWorldScene::moleculeIndexChanged() - molecule "
+          +toString(_newid)+" already present in RemovedMolecules.");
+#endif
+      LOG(1, "DEBUG: Changing GLMoleculeObject_molecule in RemovedMolecules from "
+          << _oldid << " to id " << _newid);
+      GLMoleculeObject_molecule* const molObject = olditer->second;
+      RemovedMolecules.erase(olditer);
+      RemovedMolecules[_newid] = molObject;
     }
   }

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

@@ -92 +92 @@
   void moleculeRemoved(const moleculeId_t _id);
   void moleculeSignOff(const moleculeId_t _id);
+  void moleculeEmpty(const moleculeId_t _id);
   void moleculeInserted(QtObservedMolecule::ptr);
   void moleculeSignOn(QtObservedMolecule::ptr);
@@ -136 +137 @@
   QtObservedMoleculeMap_t QtObservedMoleculeMap;
 
+  //!> set of all currently removed molecules
+  MoleculeNodeMap RemovedMolecules;
+
   //!> flag to indicate whether state map is currently worked on
   boost::recursive_mutex MoleculeMissedStateMap_mutex;