Changeset ef3013 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:

466934

Parents:

c13b91

git-author:

Frederik Heber <heber@…> (05/20/15 17:37:52)

git-committer:

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

Message:

GLWorldScene::moleculeInserted() gets moleculeId_t as param.

• we must not use pointers to instances outside the Qt world as parameters.
• we add NULL into MoleculesInSceneMap for moleculeRemoved to remove the entry.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (3 diffs)
• GLWorldScene.hpp (modified) (1 diff)
• GLWorldView.cpp (modified) (2 diffs)
• GLWorldView.hpp (modified) (1 diff)

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

@@ -113 +113 @@
       moliter++) {
     // create molecule objects in scene
-    moleculeInserted(*moliter);
+    moleculeInserted((*moliter)->getId());
   }
 }
@@ -134 +134 @@
     const bool mol_present = MoleculesinSceneMap.count(molid);
     if (!mol_present)
-      moleculeInserted(*moliter);
+      moleculeInserted((*moliter)->getId());
   }
 }
@@ -260 +260 @@
  * @param _mol molecule to insert
  */
-void GLWorldScene::moleculeInserted(const molecule * _mol)
-{
-  LOG(3, "INFO: GLWorldScene: Received signal moleculeRemoved for molecule "+toString(_mol->getId())+".");
-  MoleculeNodeMap::const_iterator iter = MoleculesinSceneMap.find(_mol->getId());
+void GLWorldScene::moleculeInserted(const moleculeId_t _id)
+{
+  LOG(3, "INFO: GLWorldScene: Received signal moleculeRemoved for molecule "+toString(_id)+".");
+  MoleculeNodeMap::const_iterator iter = MoleculesinSceneMap.find(_id);
   ASSERT( iter == MoleculesinSceneMap.end(),
-      "GLWorldScene::moleculeInserted() - molecule's id "+toString(_mol->getId())+" already present.");
+      "GLWorldScene::moleculeInserted() - molecule's id "+toString(_id)+" already present.");
 
   // add new object
-  GLMoleculeObject_molecule *molObject = new GLMoleculeObject_molecule(GLMoleculeObject::meshEmpty, this, _mol);
-  MoleculesinSceneMap.insert( make_pair(_mol->getId(), molObject) );
-  connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
-  connect (molObject, SIGNAL(atomClicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
-  connect (molObject, SIGNAL(moleculeClicked(moleculeId_t)), this, SLOT(moleculeClicked(moleculeId_t)));
-  connect (molObject, SIGNAL(changeAtomId(GLMoleculeObject_atom *, int, int)), this, SLOT(changeAtomId(GLMoleculeObject_atom *, int, int)));
-  connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(hoverChanged(const atom &)), this, SIGNAL(hoverChanged(const atom &)));
-  connect (molObject, SIGNAL(hoverChanged(const molecule &, int)), this, SIGNAL(hoverChanged(const molecule &, int)));
-  emit changed();
-  emit changeOccured();
+  const molecule *_mol = World::getInstance().getMolecule(MoleculeById(_id));
+  if (_mol != NULL) {
+    GLMoleculeObject_molecule *molObject = new GLMoleculeObject_molecule(GLMoleculeObject::meshEmpty, this, _mol);
+    MoleculesinSceneMap.insert( make_pair(_id, molObject) );
+    connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
+    connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
+    connect (molObject, SIGNAL(atomClicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
+    connect (molObject, SIGNAL(moleculeClicked(moleculeId_t)), this, SLOT(moleculeClicked(moleculeId_t)));
+    connect (molObject, SIGNAL(changeAtomId(GLMoleculeObject_atom *, int, int)), this, SLOT(changeAtomId(GLMoleculeObject_atom *, int, int)));
+    connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
+    connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
+    connect (molObject, SIGNAL(hoverChanged(const atom &)), this, SIGNAL(hoverChanged(const atom &)));
+    connect (molObject, SIGNAL(hoverChanged(const molecule &, int)), this, SIGNAL(hoverChanged(const molecule &, int)));
+    emit changed();
+    emit changeOccured();
+  } else {
+    // the molecule is already gone, we add it nonetheless as null object as
+    // lateron moleculeRemoved wants to erase it.
+    ELOG(1, "GLWorldScene::moleculeInserted() - added null object for not present mol id " << _id);
+    GLMoleculeObject_molecule *molObject = NULL;
+    MoleculesinSceneMap.insert( make_pair(_id, molObject) );
+  }
 }
 

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

@@ -84 +84 @@
   void moleculeClicked(moleculeId_t no);
   void moleculeRemoved(const moleculeId_t _id);
-  void moleculeInserted(const molecule * _mol);
+  void moleculeInserted(const moleculeId_t _id);
   void worldSelectionChanged();
   void bondInserted(const bond::ptr _bond, const GLMoleculeObject_bond::SideOfBond side);

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

@@ -91 +91 @@
   connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
   connect(this, SIGNAL(moleculeRemoved(const moleculeId_t)), worldscene, SLOT(moleculeRemoved(const moleculeId_t)));
-  connect(this, SIGNAL(moleculeInserted(const molecule *)), worldscene, SLOT(moleculeInserted(const molecule *)));
+  connect(this, SIGNAL(moleculeInserted(const moleculeId_t)), worldscene, SLOT(moleculeInserted(const moleculeId_t)));
   //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
   connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
@@ -348 +348 @@
       case World::MoleculeInserted:
       {
-        const molecule * _mol = World::getInstance().lastChanged<molecule>();
+        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(_mol->getId())+" has been removed.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_id)+" has been removed.";
   #endif
-        emit moleculeInserted(_mol);
+        emit moleculeInserted(_id);
         break;
       }

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

@@ -59 +59 @@
   void changed();
   void TimeChanged();
-  void moleculeInserted(const molecule * _mol);
+  void moleculeInserted(const moleculeId_t _id);
   void moleculeRemoved(const moleculeId_t _id);
   void worldSelectionChanged();