Changeset 30cd0d for src/UIElements/Views/Qt4

Timestamp:

Jul 17, 2012, 12:17:29 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

9d5531

Parents:

4f7f0bf

git-author:

Michael Ankele <ankele@…> (07/03/12 13:34:51)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:29)

Message:

GLWorldScene handles IndexChanged message from atoms

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

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

@@ -110 +110 @@
 void GLMoleculeObject_atom::resetIndex()
 {
+  int oldId = objectId();
   const size_t atomno = _atom->getId();
   LOG(4, "INFO: GLMoleculeObject_atom::resetIndex() - new index is "+toString(atomno)+".");
   setObjectId(atomno);
+
+  emit indexChanged(this, oldId, atomno);
 }
 

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

@@ -41 +41 @@
   void clicked(atomId_t);
   void BondsInserted(const bond *_bond, const GLMoleculeObject_bond::SideOfBond side);
+  void indexChanged(GLMoleculeObject_atom *ob, int oldId, int newId);
 
 private:

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

@@ -143 +143 @@
   connect (atomObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
   connect (atomObject, SIGNAL(BondsInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)));
+  connect (atomObject, SIGNAL(indexChanged(GLMoleculeObject_atom*, int, int)), this, SLOT(changeAtomId(GLMoleculeObject_atom*, int, int)));
   //bondsChanged(_atom);
   emit changeOccured();
@@ -356 +357 @@
 }
 
+void GLWorldScene::changeAtomId(GLMoleculeObject_atom *ob, int oldId, int newId)
+{
+  LOG(3, "INFO: GLWorldScene - change atom id " << oldId << " to " << newId << ".");
+  // Remove from map.
+  AtomNodeMap::iterator iter = AtomsinSceneMap.find(oldId);
+  ASSERT(iter != AtomsinSceneMap.end(),
+        "GLWorldScene::objectIdChangedSignalled() - atom with id "+toString(oldId)+" not on display.");
+  GLMoleculeObject_atom *atomObject = iter->second;
+  AtomsinSceneMap.erase(iter);
+
+  // Reinsert with new id.
+  AtomsinSceneMap.insert( make_pair(newId, atomObject) );
+}
+

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

@@ -84 +84 @@
   void setSelectionModeMolecule();
   void hoverChangedSignalled(GLMoleculeObject *ob);
+  void changeAtomId(GLMoleculeObject_atom *ob, int oldId, int newOd);
 
 private:

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

@@ -62 +62 @@
   connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
   connect(this, SIGNAL(moleculeRemoved(const molecule *)), worldscene, SLOT(moleculeRemoved(const molecule *)));
+  //connect(this, SIGNAL(moleculeInserted(const molecule *)), worldscene, SLOT(moleculeInserted(const molecule *)));
   //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
   connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));