Changeset beadd0 for src

Timestamp:

Sep 29, 2013, 11:40:49 AM (11 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:

917659

Parents:

8481f5

git-author:

Frederik Heber <heber@…> (09/03/13 07:39:17)

git-committer:

Frederik Heber <heber@…> (09/29/13 11:40:49)

Message:

Changed atom ptr into atomicId_t param for atomInserted of GLWorld... classes.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -121 +121 @@
           ++atomiter) {
         // create atom objects in scene
-        atomInserted(*atomiter);
+        atomInserted((*atomiter)->getId());
 
         // create bond objects in scene
@@ -142 +142 @@
  * @param _atom atom to add
  */
-void GLWorldScene::atomInserted(const atom *_atom)
-{
-  LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_atom->getId())+".");
+void GLWorldScene::atomInserted(const atomicNumber_t _id)
+{
+  LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_id)+".");
+  const atom *_atom = World::getInstance().getAtom(AtomById(_id));
   GLMoleculeObject_atom *atomObject = new GLMoleculeObject_atom(meshSphere, this, _atom);
-  AtomNodeMap::iterator iter = AtomsinSceneMap.find(_atom->getId());
+  AtomNodeMap::iterator iter = AtomsinSceneMap.find(_id);
   ASSERT(iter == AtomsinSceneMap.end(),
       "GLWorldScene::atomAdded() - same atom "+_atom->getName()+" added again.");
-  AtomsinSceneMap.insert( make_pair(_atom->getId(), atomObject) );
+  AtomsinSceneMap.insert( make_pair(_id, atomObject) );
 
   qRegisterMetaType<atomId_t>("atomId_t");

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

@@ -78 +78 @@
 private slots:
   void atomClicked(atomId_t no);
-  void atomInserted(const atom *_atom);
+  void atomInserted(const atomicNumber_t _id);
   void atomRemoved(const atomicNumber_t _id);
   void moleculeRemoved(const molecule *_molecule);

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

@@ -85 +85 @@
   connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
   connect(worldscene, SIGNAL(hoverChanged(const atom *)), this, SLOT(sceneHoverSignalled(const atom *)));
-  connect(this, SIGNAL(atomInserted(const atom *)), worldscene, SLOT(atomInserted(const atom *)));
+  connect(this, SIGNAL(atomInserted(const atomicNumber_t)), worldscene, SLOT(atomInserted(const atomicNumber_t)));
   connect(this, SIGNAL(atomRemoved(const atomicNumber_t)), worldscene, SLOT(atomRemoved(const atomicNumber_t)));
   connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
@@ -318 +318 @@
       case World::AtomInserted:
       {
-        const atom *_atom = World::getInstance().lastChanged<atom>();
+        const atomicNumber_t _id = World::getInstance().lastChanged<atom>()->getId();
   #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_atom->getId())+" has been inserted.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
   #endif
-        emit atomInserted(_atom);
+        emit atomInserted(_id);
         break;
       }
@@ -329 +329 @@
         const atomicNumber_t _id = World::getInstance().lastChanged<atom>()->getId();
   #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_atom->getId())+" has been removed.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been removed.";
   #endif
         emit atomRemoved(_id);

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

@@ -55 +55 @@
 signals:
   void changed();
-  void atomInserted(const atom *_atom);
+  void atomInserted(const atomicNumber_t _id);
   void atomRemoved(const atomicNumber_t _id);
   void moleculeInserted(const molecule *_molecule);