Changeset 522c45 for src/UIElements/Qt4

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/Qt4/InstanceBoard

Files:

• QtObservedAtom.cpp (modified) (2 diffs)
• QtObservedAtom.hpp (modified) (2 diffs)
• QtObservedBond.cpp (modified) (1 diff)
• QtObservedBond.hpp (modified) (1 diff)
• QtObservedMolecule.cpp (modified) (2 diffs)
• QtObservedMolecule.hpp (modified) (2 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -101 +101 @@
   signedOffChannels(0),
   owner(NULL),
-  oldId(_id),
   index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedAtom * const>(this))),
   board(_board),
@@ -268 +267 @@
     case AtomObservable::IndexChanged:
     {
-      const atomId_t newId = getAtomIndex();
-      emit indexChanged(oldId, newId);
-      oldId = newId;
+      emit indexChanged();
       break;
     }

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp

@@ -149 +149 @@
 
 signals:
-  void indexChanged(const atomId_t, const atomId_t);
+  void indexChanged();
   void bondsChanged();
   void elementChanged();
@@ -288 +288 @@
 
 private:
-  //!> contains still the old id after the index of the atom changed
-  atomId_t oldId;
-
   //!> unique index among all observed instances
   const ObservedValue_Index_t index;

src/UIElements/Qt4/InstanceBoard/QtObservedBond.cpp

@@ -250 +250 @@
 
   // pass thru to signals from both atoms
-  connect( leftatom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)),
-      this, SIGNAL(leftAtomIndexChanged(atomId_t, atomId_t)));
+  connect( leftatom.get(), SIGNAL(indexChanged()), this, SIGNAL(leftAtomIndexChanged()));
   connect( leftatom.get(), SIGNAL(elementChanged()), this, SIGNAL(leftAtomElementChanged()));
   connect( leftatom.get(), SIGNAL(positionChanged()), this, SIGNAL(leftAtomPositionChanged()));
   connect( leftatom.get(), SIGNAL(moleculeChanged()), this, SIGNAL(leftmoleculeChanged()));
-  connect( rightatom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)),
-      this, SIGNAL(rightAtomIndexChanged(atomId_t, atomId_t)));
+  connect( rightatom.get(), SIGNAL(indexChanged()), this, SIGNAL(rightAtomIndexChanged()));
   connect( rightatom.get(), SIGNAL(elementChanged()), this, SIGNAL(rightAtomElementChanged()));
   connect( rightatom.get(), SIGNAL(positionChanged()), this, SIGNAL(rightAtomPositionChanged()));

src/UIElements/Qt4/InstanceBoard/QtObservedBond.hpp

@@ -190 +190 @@
 signals:
 
-  void indexChanged(bondId_t, bondId_t);
+  void indexChanged();
   void degreeChanged();
-  void leftAtomIndexChanged(atomId_t, atomId_t);
+  void leftAtomIndexChanged();
   void leftAtomElementChanged();
   void leftAtomPositionChanged();
   void leftmoleculeChanged();
-  void rightAtomIndexChanged(atomId_t, atomId_t);
+  void rightAtomIndexChanged();
   void rightAtomElementChanged();
   void rightAtomPositionChanged();

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.cpp

@@ -109 +109 @@
   signedOffChannels(0),
   owner(NULL),
-  oldId(_id),
   index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedMolecule * const>(this))),
   board(_board),
@@ -276 +275 @@
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+"'s index has changed.";
   #endif
-        const moleculeId_t newId = getMolIndex();
-        emit indexChanged(oldId, newId);
-        oldId = newId;
+        emit indexChanged();
         break;
       }

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp

@@ -160 +160 @@
   void bondcountChanged();
   void formulaChanged();
-  void indexChanged(const moleculeId_t, const moleculeId_t);
+  void indexChanged();
   void nameChanged();
   void nononhydrogenChanged();
@@ -311 +311 @@
 
 private:
-  //!> contains still the old index after the index changed
-  moleculeId_t oldId;
-
   //!> unique index among all observed instances
   const ObservedValue_Index_t index;