Changeset efeeb7 for src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp

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:

1eba7c

Parents:

649f59

git-author:

Frederik Heber <heber@…> (04/17/16 21:26:58)

git-committer:

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

Message:

GLWorldScene now holds onto atoms and bonds until ..Removed() signal and parent(s) is reset.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp (modified) (4 diffs)

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

@@ -135 +135 @@
       GLMoleculeObject_bond::SideOfBond _side) const;
 
+  void checkAndRemoveBond(const ObservedValue_Index_t &_bondid);
+
+  void checkAndRemoveAtom(const ObservedValue_Index_t &_atomid);
+
 public:
   void updateSelectedShapes();
@@ -142 +146 @@
 
   typedef std::map< ObservedValue_Index_t, QObject* > ObservedValueIndexLookup_t;
-
-private:
-
-  //!> id of atom hovered over
-  atomId_t hoverAtomId;
 
   typedef std::map< ObservedValue_Index_t, GLMoleculeObject_molecule* > MoleculeNodeMap;
@@ -163 +162 @@
       boost::bimaps::multiset_of< ObservedValue_Index_t >
   > BondNodeParentMap_t;
+
+  typedef std::set< ObservedValue_Index_t > ToBeRemovedNodes_t;
+
+private:
+
+  //!> id of atom hovered over
+  atomId_t hoverAtomId;
 
   //!> mutex to ascertain atomic access to NodeParentMaps
@@ -182 +188 @@
   ObservedValueIndexLookup_t ObservedValueIndexLookup;
 
+  //!> all atoms and bond id where we got the ...Removed signals for
+  ToBeRemovedNodes_t ToBeRemovedNodes;
+
   SelectionModeType selectionMode;