Changeset 49c965 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp

Timestamp:

Jul 17, 2012, 12:17:29 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

4f7f0bf

Parents:

c736fe

git-author:

Michael Ankele <ankele@…> (06/29/12 15:28:17)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:29)

Message:

Fix: GLMoleculeObject_bond must not signOff after subjectKilled

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp (modified) (3 diffs)

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

@@ -83 +83 @@
 {
   // sign on as observer (obtain non-const instance before)
-  _bond->signOff(this, BondObservable::BondRemoved);
-  _bond->leftatom->signOff(this, AtomObservable::PositionChanged);
-  _bond->rightatom->signOff(this, AtomObservable::PositionChanged);
-
-  LOG(2, "INFO: Destroying  GLMoleculeObject_bond to bond " << *_bond << " and side " << BondSide << ".");
+  if (_bond){
+    _bond->signOff(this, BondObservable::BondRemoved);
+    _bond->leftatom->signOff(this, AtomObservable::PositionChanged);
+    _bond->rightatom->signOff(this, AtomObservable::PositionChanged);
+    LOG(2, "INFO: Destroying  GLMoleculeObject_bond to bond " << *_bond << " and side " << BondSide << ".");
+  }else{
+    LOG(2, "INFO: Destroying  GLMoleculeObject_bond (bond already killed).");
+  }
 }
 
@@ -112 +115 @@
       break;
   }
+
+  // Don't let the destructor automatically sign off from a dead bond!
+  _bond->leftatom->signOff(this, AtomObservable::PositionChanged);
+  _bond->rightatom->signOff(this, AtomObservable::PositionChanged);
+  _bond = NULL;
   delete this;
 }
@@ -139 +147 @@
             break;
         }
+
+        // Don't let the destructor automatically sign off from a dead bond!
+        _bond->leftatom->signOff(this, AtomObservable::PositionChanged);
+        _bond->rightatom->signOff(this, AtomObservable::PositionChanged);
+        _bond = NULL;
         delete this;
         break;