Changeset ea7926 for src

Timestamp:

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

0bddd1e

Parents:

1eba7c

git-author:

Frederik Heber <heber@…> (04/20/16 05:45:11)

git-committer:

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

Message:

Split ObservedValueIndexLookup such that it is protected under atom or bond mutex.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (4 diffs)
• GLWorldScene.hpp (modified) (1 diff)

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

@@ -242 +242 @@
   std::pair< ObservedValueIndexLookup_t::iterator, bool > indexinserter =
 #endif
-      ObservedValueIndexLookup.insert( std::make_pair(atomid, _atom.get()) );
+      ObservedAtomIndexLookup.insert( std::make_pair(atomid, _atom.get()) );
   ASSERT( indexinserter.second,
       "GLWorldScene::connectAtom() - observed atom's index "
@@ -341 +341 @@
     AtomNodeParentMap.left.erase(_atomid);
     ToBeRemovedNodes.erase(_atomid);
-    removeStoredObservedValue(ObservedValueIndexLookup, ObservedAtoms, _atomid);
+    removeStoredObservedValue(ObservedAtomIndexLookup, ObservedAtoms, _atomid);
   }
 }
@@ -395 +395 @@
     std::pair< ObservedValueIndexLookup_t::iterator, bool > indexinserter =
 #endif
-        ObservedValueIndexLookup.insert( std::make_pair(bondid, _bond.get()) );
+        ObservedBondIndexLookup.insert( std::make_pair(bondid, _bond.get()) );
     ASSERT( indexinserter.second,
         "GLWorldScene::connectBond() - observed bond's index "
@@ -471 +471 @@
     LOG(3, "DEBUG: Found both parents of to be removed bond " << _bondid << " as GLWorldScene, removing.");
     removeBondFromScene(BondsinSceneMap, _bondid);
-    removeStoredObservedValue(ObservedValueIndexLookup, ObservedBonds, _bondid);
+    removeStoredObservedValue(ObservedBondIndexLookup, ObservedBonds, _bondid);
     eraseBondNodeParents(BondNodeParentMaps, _bondid);
     ToBeRemovedNodes.erase(_bondid);

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

@@ -186 +186 @@
   //!> stored observed bond such that its signals may always be safely evaluated
   ObservedBonds_t ObservedBonds;
-  //!> in moleculeChanged() we only have QObject*, in reparent..() we have ObservedValue_Index_t, need lookup
-  ObservedValueIndexLookup_t ObservedValueIndexLookup;
+  //!> in moleculeChanged() we only have QObject*, in reparentAtom() we have ObservedValue_Index_t, need lookup
+  ObservedValueIndexLookup_t ObservedAtomIndexLookup;
+  //!> in moleculeChanged() we only have QObject*, in reparentBond..() we have ObservedValue_Index_t, need lookup
+  ObservedValueIndexLookup_t ObservedBondIndexLookup;
 
   //!> all atoms and bond id where we got the ...Removed signals for