Changeset 507f3c for src/UIElements

Timestamp:

Apr 25, 2016, 7:02:56 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:

d16a06

Parents:

522c45

git-author:

Frederik Heber <heber@…> (04/14/16 08:01:31)

git-committer:

Frederik Heber <heber@…> (04/25/16 07:02:56)

Message:

QtObservedBond returns ::ptr instead of ptr from left and right atom.

• FIX: GLWorldScene crashed on resolving sender() of a reparent..() signal because the object got destroyed in the meantime.

Location:

src/UIElements

Files:

• Qt4/InstanceBoard/QtObservedBond.hpp (modified) (2 diffs)
• Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldScene.hpp (modified) (1 diff)

src/UIElements/Qt4/InstanceBoard/QtObservedBond.hpp

@@ -127 +127 @@
    * \return const ref to left atom's observed state.
    */
-  const QtObservedAtom* const getLeftAtom() const
-  { return leftatom.get(); }
+  const QtObservedAtom::ptr getLeftAtom() const
+  { return leftatom; }
 
   /** Getter to the observed state of the right atom of this bond.
@@ -134 +134 @@
    * \return const ref to right atom's observed state.
    */
-  const QtObservedAtom* const getRightAtom() const
-  { return rightatom.get(); }
+  const QtObservedAtom::ptr getRightAtom() const
+  { return rightatom; }
 
   /** Getter to bond's left atom index contained in \a ObservedValues.

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

@@ -592 +592 @@
 void GLWorldScene::reparentBond(
     QtObservedBond *_bond,
-    const QtObservedAtom * const _atom,
+    const QtObservedAtom::ptr _atom,
     const GLMoleculeObject_bond::SideOfBond _side)
 {

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

@@ -128 +128 @@
   void reparentBond(
       QtObservedBond *_bond,
-      const QtObservedAtom * const _atom,
+      const QtObservedAtom::ptr _atom,
       const GLMoleculeObject_bond::SideOfBond _side);