Changeset 466934 for src/UIElements/Views

Timestamp:

Jun 23, 2015, 6:29:02 AM (10 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:

ec6abc

Parents:

ef3013

git-author:

Frederik Heber <heber@…> (05/20/15 18:04:49)

git-committer:

Frederik Heber <heber@…> (06/23/15 06:29:02)

Message:

GLWorldScene::atomInserted() also adds NULL object to ..inSceneMap.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (1 diff)

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

@@ -181 +181 @@
   LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_id)+".");
   // find associated molecule
-  const moleculeId_t molid = World::getInstance().getAtom(AtomById(_id))->getMolecule()->getId();
-  MoleculeNodeMap::const_iterator moliter = MoleculesinSceneMap.find(molid );
-  ASSERT(moliter != MoleculesinSceneMap.end(),
-      "GLWorldScene::atomAdded() - molecule with id of "+toString(molid)
-      +" atom with id "+toString(_id)+" is unknown.");
-  GLMoleculeObject_molecule *molObject = moliter->second;
-
-  // add atom to internal list
+  const atom *_atom = World::getInstance().getAtom(AtomById(_id));
+  if (_atom != NULL) {
+    const moleculeId_t molid = _atom->getMolecule()->getId();
+    MoleculeNodeMap::const_iterator moliter = MoleculesinSceneMap.find(molid );
+    ASSERT(moliter != MoleculesinSceneMap.end(),
+        "GLWorldScene::atomAdded() - molecule with id of "+toString(molid)
+        +" atom with id "+toString(_id)+" is unknown.");
+    GLMoleculeObject_molecule *molObject = moliter->second;
+
+    // add atom to internal list
 #ifndef NDEBUG
-  AtomMoleculeMap::const_iterator atomiter = AtomsinSceneMap.find(_id);
-    ASSERT(atomiter == AtomsinSceneMap.end(),
-        "GLWorldScene::atomRemoved() - atom "+toString(_id)+" already known.");
+    AtomMoleculeMap::const_iterator atomiter = AtomsinSceneMap.find(_id);
+      ASSERT(atomiter == AtomsinSceneMap.end(),
+          "GLWorldScene::atomRemoved() - atom "+toString(_id)+" already known.");
 #endif
-  AtomsinSceneMap.insert( std::make_pair( _id, molObject ));
-
-  // inform its GlMoleculeObject_molecule.
-  molObject->atomInserted(_id);
-
-  // emit change
-  emit changeOccured();
+    AtomsinSceneMap.insert( std::make_pair( _id, molObject ));
+
+    // inform its GlMoleculeObject_molecule.
+    molObject->atomInserted(_id);
+
+    // emit change
+    emit changeOccured();
+  } else {
+    ELOG(1, "GLWorldScene::atomInserted() - added NULL molobject to AtomsinSceneMap for id " << _id);
+    GLMoleculeObject_molecule *molObject = NULL;
+    AtomsinSceneMap.insert( std::make_pair( _id, molObject ));
+  }
 }