Changeset f759e5 for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Jul 25, 2015, 1:01:21 PM (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:

2f76d2

Parents:

9c259e

git-author:

Frederik Heber <heber@…> (06/18/15 01:24:00)

git-committer:

Frederik Heber <heber@…> (07/25/15 13:01:21)

Message:

FIX: GLWorldView must not listen to moleculeRemoved but to its subjectKilled.

• atoms of a molecule a removed after moleculeRemoved which only gives a prior note about the removal. Then, we are flooded with atomRemoved for each of its atom which go into MoleculeMissedStateMap and pop up when a same-id molecule is instantiated, causing assert failures.

File:

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

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

@@ -102 +102 @@
   World::getInstance().signOn(this);
   World::getInstance().signOn(this, World::MoleculeInserted);
-  World::getInstance().signOn(this, World::MoleculeRemoved);
   World::getInstance().signOn(this, World::SelectionChanged);
   WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
@@ -134 +133 @@
   World::getInstance().signOff(this, World::AtomRemoved);
   World::getInstance().signOff(this, World::MoleculeInserted);
-  World::getInstance().signOff(this, World::MoleculeRemoved);
   World::getInstance().signOff(this, World::SelectionChanged);
   WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
@@ -410 +408 @@
           emit moleculeInserted(_id);
         }
-        break;
-      }
-      case World::MoleculeRemoved:
-      {
-        const moleculeId_t _id = World::getInstance().lastChanged<molecule>()->getId();
-  #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_id)+" has been removed.";
-  #endif
-        // removed from ObservedMolecules via subjectKilled
-        emit moleculeRemoved(_id);
         break;
       }