Changeset 522c45 for src/UIElements/Views/Qt4/Qt3D

Timestamp:

Apr 25, 2016, 7:02:56 AM (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:

507f3c

Parents:

6c4b69

git-author:

Frederik Heber <heber@…> (04/14/16 07:47:20)

git-committer:

Frederik Heber <heber@…> (04/25/16 07:02:56)

Message:

QtObserved... signals indexChanged does not transmit ids anymore.

• since the change to ObservedValue_Index_t, the id is not used anymore. Only in the GUI for the objectid.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (2 diffs)
• GLMoleculeObject_atom.hpp (modified) (1 diff)
• GLMoleculeObject_molecule.cpp (modified) (3 diffs)
• GLMoleculeObject_molecule.hpp (modified) (1 diff)

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

@@ -74 +74 @@
 
   connect( this, SIGNAL(clicked()), this, SLOT(wasClicked()));
-  connect( ObservedAtom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)), this, SLOT(resetIndex(const atomId_t, const atomId_t)));
+  connect( ObservedAtom.get(), SIGNAL(indexChanged()), this, SLOT(resetIndex()));
   connect( ObservedAtom.get(), SIGNAL(elementChanged()), this, SLOT(resetElement()));
   connect( ObservedAtom.get(), SIGNAL(positionChanged()), this, SLOT(resetPosition()));
@@ -83 +83 @@
 {}
 
-void GLMoleculeObject_atom::resetIndex(const atomId_t, const atomId_t)
+void GLMoleculeObject_atom::resetIndex()
 {
   const atomId_t newId = ObservedAtom->getAtomIndex();

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

@@ -43 +43 @@
 private slots:
   void wasClicked();
-  void resetIndex(const atomId_t, const atomId_t);
+  void resetIndex();
   void resetElement();
   void resetPosition();

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

@@ -57 +57 @@
 #include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
 #include "Atom/TesselPoint.hpp"
-#include "World.hpp"
 
 static QGLSceneNode *createMoleculeMesh(const QGeometryData &_geo)
@@ -102 +101 @@
   connect (ObservedMolecule.get(), SIGNAL(tesselationhullChanged()), this, SLOT(setTesselationOutOfDate()));
   connect (ObservedMolecule.get(), SIGNAL(boundingboxChanged()), this, SLOT(resetBoundingBox()));
-  connect (ObservedMolecule.get(), SIGNAL(indexChanged(const moleculeId_t, const moleculeId_t)),
-      this, SLOT(resetIndex(const moleculeId_t, const moleculeId_t)));
+  connect (ObservedMolecule.get(), SIGNAL(indexChanged()), this, SLOT(resetIndex()));
   /// these are channeled through GLWorldScene instead to ensure synchronicity
 //  connect (ObservedMolecule.get(), SIGNAL(atomInserted(QtObservedAtom::ptr)),
@@ -217 +215 @@
 }
 
-void GLMoleculeObject_molecule::resetIndex(const moleculeId_t, const moleculeId_t)
+void GLMoleculeObject_molecule::resetIndex()
 {
   const atomId_t newId = ObservedMolecule->getMolIndex();

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

@@ -66 +66 @@
   void setTesselationOutOfDate();
   void resetBoundingBox();
-  void resetIndex(const moleculeId_t, const moleculeId_t);
+  void resetIndex();
   void resetSelected();