Changeset 522c45 for src/UIElements


Ignore:
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
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

    r6c4b69 r522c45  
    101101  signedOffChannels(0),
    102102  owner(NULL),
    103   oldId(_id),
    104103  index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedAtom * const>(this))),
    105104  board(_board),
    … …  
    268267    case AtomObservable::IndexChanged:
    269268    {
    270       const atomId_t newId = getAtomIndex();
    271       emit indexChanged(oldId, newId);
    272       oldId = newId;
     269      emit indexChanged();
    273270      break;
    274271    }

  • src/UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp

    r6c4b69 r522c45  
    149149
    150150signals:
    151   void indexChanged(const atomId_t, const atomId_t);
     151  void indexChanged();
    152152  void bondsChanged();
    153153  void elementChanged();
    … …  
    288288
    289289private:
    290   //!> contains still the old id after the index of the atom changed
    291   atomId_t oldId;
    292 
    293290  //!> unique index among all observed instances
    294291  const ObservedValue_Index_t index;

  • src/UIElements/Qt4/InstanceBoard/QtObservedBond.cpp

    r6c4b69 r522c45  
    250250
    251251  // pass thru to signals from both atoms
    252   connect( leftatom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)),
    253       this, SIGNAL(leftAtomIndexChanged(atomId_t, atomId_t)));
     252  connect( leftatom.get(), SIGNAL(indexChanged()), this, SIGNAL(leftAtomIndexChanged()));
    254253  connect( leftatom.get(), SIGNAL(elementChanged()), this, SIGNAL(leftAtomElementChanged()));
    255254  connect( leftatom.get(), SIGNAL(positionChanged()), this, SIGNAL(leftAtomPositionChanged()));
    256255  connect( leftatom.get(), SIGNAL(moleculeChanged()), this, SIGNAL(leftmoleculeChanged()));
    257   connect( rightatom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)),
    258       this, SIGNAL(rightAtomIndexChanged(atomId_t, atomId_t)));
     256  connect( rightatom.get(), SIGNAL(indexChanged()), this, SIGNAL(rightAtomIndexChanged()));
    259257  connect( rightatom.get(), SIGNAL(elementChanged()), this, SIGNAL(rightAtomElementChanged()));
    260258  connect( rightatom.get(), SIGNAL(positionChanged()), this, SIGNAL(rightAtomPositionChanged()));

  • src/UIElements/Qt4/InstanceBoard/QtObservedBond.hpp

    r6c4b69 r522c45  
    190190signals:
    191191
    192   void indexChanged(bondId_t, bondId_t);
     192  void indexChanged();
    193193  void degreeChanged();
    194   void leftAtomIndexChanged(atomId_t, atomId_t);
     194  void leftAtomIndexChanged();
    195195  void leftAtomElementChanged();
    196196  void leftAtomPositionChanged();
    197197  void leftmoleculeChanged();
    198   void rightAtomIndexChanged(atomId_t, atomId_t);
     198  void rightAtomIndexChanged();
    199199  void rightAtomElementChanged();
    200200  void rightAtomPositionChanged();

  • src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.cpp

    r6c4b69 r522c45  
    109109  signedOffChannels(0),
    110110  owner(NULL),
    111   oldId(_id),
    112111  index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedMolecule * const>(this))),
    113112  board(_board),
    … …  
    276275        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+"'s index has changed.";
    277276  #endif
    278         const moleculeId_t newId = getMolIndex();
    279         emit indexChanged(oldId, newId);
    280         oldId = newId;
     277        emit indexChanged();
    281278        break;
    282279      }

  • src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp

    r6c4b69 r522c45  
    160160  void bondcountChanged();
    161161  void formulaChanged();
    162   void indexChanged(const moleculeId_t, const moleculeId_t);
     162  void indexChanged();
    163163  void nameChanged();
    164164  void nononhydrogenChanged();
    … …  
    311311
    312312private:
    313   //!> contains still the old index after the index changed
    314   moleculeId_t oldId;
    315 
    316313  //!> unique index among all observed instances
    317314  const ObservedValue_Index_t index;

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

    r6c4b69 r522c45  
    7474
    7575  connect( this, SIGNAL(clicked()), this, SLOT(wasClicked()));
    76   connect( ObservedAtom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)), this, SLOT(resetIndex(const atomId_t, const atomId_t)));
     76  connect( ObservedAtom.get(), SIGNAL(indexChanged()), this, SLOT(resetIndex()));
    7777  connect( ObservedAtom.get(), SIGNAL(elementChanged()), this, SLOT(resetElement()));
    7878  connect( ObservedAtom.get(), SIGNAL(positionChanged()), this, SLOT(resetPosition()));
    … …  
    8383{}
    8484
    85 void GLMoleculeObject_atom::resetIndex(const atomId_t, const atomId_t)
     85void GLMoleculeObject_atom::resetIndex()
    8686{
    8787  const atomId_t newId = ObservedAtom->getAtomIndex();

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

    r6c4b69 r522c45  
    4343private slots:
    4444  void wasClicked();
    45   void resetIndex(const atomId_t, const atomId_t);
     45  void resetIndex();
    4646  void resetElement();
    4747  void resetPosition();

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

    r6c4b69 r522c45  
    5757#include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
    5858#include "Atom/TesselPoint.hpp"
    59 #include "World.hpp"
    6059
    6160static QGLSceneNode *createMoleculeMesh(const QGeometryData &_geo)
    … …  
    102101  connect (ObservedMolecule.get(), SIGNAL(tesselationhullChanged()), this, SLOT(setTesselationOutOfDate()));
    103102  connect (ObservedMolecule.get(), SIGNAL(boundingboxChanged()), this, SLOT(resetBoundingBox()));
    104   connect (ObservedMolecule.get(), SIGNAL(indexChanged(const moleculeId_t, const moleculeId_t)),
    105       this, SLOT(resetIndex(const moleculeId_t, const moleculeId_t)));
     103  connect (ObservedMolecule.get(), SIGNAL(indexChanged()), this, SLOT(resetIndex()));
    106104  /// these are channeled through GLWorldScene instead to ensure synchronicity
    107105//  connect (ObservedMolecule.get(), SIGNAL(atomInserted(QtObservedAtom::ptr)),
    … …  
    217215}
    218216
    219 void GLMoleculeObject_molecule::resetIndex(const moleculeId_t, const moleculeId_t)
     217void GLMoleculeObject_molecule::resetIndex()
    220218{
    221219  const atomId_t newId = ObservedMolecule->getMolIndex();

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

    r6c4b69 r522c45  
    6666  void setTesselationOutOfDate();
    6767  void resetBoundingBox();
    68   void resetIndex(const moleculeId_t, const moleculeId_t);
     68  void resetIndex();
    6969  void resetSelected();
    7070
Note: See TracChangeset for help on using the changeset viewer.