Changeset 9c18e4 for src

Timestamp:

Oct 6, 2011, 4:06:10 PM (13 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:

df765f

Parents:

5e2f80

git-author:

Frederik Heber <heber@…> (09/01/11 18:17:08)

git-committer:

Frederik Heber <heber@…> (10/06/11 16:06:10)

Message:

FIX: Observers (GLMoleculeObject_atom, GLWorldScene) sign off on destruction.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (1 diff)
• GLMoleculeObject_atom.hpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (1 diff)
• GLWorldView.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 
   connect( this, SIGNAL(clicked()), this, SLOT(wasClicked()));
+}
+
+GLMoleculeObject_atom::~GLMoleculeObject_atom()
+{
+  _atom->signOff(this, _atom->getChannel(AtomObservable::IndexChanged));
+  _atom->signOff(this, _atom->getChannel(AtomObservable::PositionChanged));
+  _atom->signOff(this, _atom->getChannel(AtomObservable::ElementChanged));
+  _atom->signOff(this, _atom->getChannel(AtomObservable::BondsChanged));
 }
 

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

@@ -25 +25 @@
 public:
   GLMoleculeObject_atom(QObject *parent, const atom *atomref);
-  virtual ~GLMoleculeObject_atom() {}
+  virtual ~GLMoleculeObject_atom();
 
   // Observer functions

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

@@ -69 +69 @@
         atomInserted(*atomiter);
 
-        // create its bonds
-        const BondList &bonds = (*atomiter)->getListOfBonds();
-        for (BondList::const_iterator bonditer = bonds.begin();
-            bonditer != bonds.end();
-            ++bonditer) {
-          if ((*bonditer)->leftatom->getId() == (*atomiter)->getId()) {
-            // create bond objects in scene
-            bondInserted(*bonditer);
-          }
-        }
+        // create bond objects in scene
+        bondsChanged(*atomiter);
       }
     }

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

@@ -50 +50 @@
 GLWorldView::~GLWorldView()
 {
+  World::getInstance().signOff(this);
+  World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomInserted));
+  World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomRemoved));
   delete worldscene;
 }