Changeset 1c0961 for src/UIElements


Ignore:
Timestamp:
Feb 14, 2016, 12:34:29 PM (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:
8281cc
Parents:
62a0ee
git-author:
Frederik Heber <heber@…> (01/26/16 16:16:19)
git-committer:
Frederik Heber <heber@…> (02/14/16 12:34:29)
Message:

FIX: indexChanged from QtObserved... transmit both old and new id.

Location:
src/UIElements
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r62a0ee r1c0961  
    101101  signedOffChannels(0),
    102102  owner(NULL),
     103  oldId(_id),
    103104  board(_board),
    104105  BoardIsGone(false),
    … …  
    264265  switch (notification->getChannelNo()) {
    265266    case AtomObservable::IndexChanged:
    266       emit indexChanged();
    267       break;
     267    {
     268      const atomId_t newId = getAtomIndex();
     269      emit indexChanged(oldId, newId);
     270      oldId = newId;
     271      break;
     272    }
    268273    case AtomObservable::BondsAdded:
    269274    case AtomObservable::BondsRemoved:

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

    r62a0ee r1c0961  
    131131
    132132signals:
    133   void indexChanged();
     133  void indexChanged(const atomId_t, const atomId_t);
    134134  void bondsChanged();
    135135  void elementChanged();
    … …  
    251251
    252252private:
     253  //!> contains still the old id after the index of the atom changed
     254  atomId_t oldId;
    253255
    254256  //!> reference to InstanceBoard for callbacks on subjectKilled()

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

    r62a0ee r1c0961  
    110110  signedOffChannels(0),
    111111  owner(NULL),
     112  oldId(_id),
    112113  board(_board),
    113114  BoardIsGone(false),
    … …  
    272273        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+"'s index has changed.";
    273274  #endif
    274         emit indexChanged();
     275        const moleculeId_t newId = getMolIndex();
     276        emit indexChanged(oldId, newId);
     277        oldId = newId;
    275278        break;
    276279      }

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

    r62a0ee r1c0961  
    143143  void bondcountChanged();
    144144  void formulaChanged();
    145   void indexChanged();
     145  void indexChanged(const moleculeId_t, const moleculeId_t);
    146146  void nameChanged();
    147147  void nononhydrogenChanged();
    … …  
    277277
    278278private:
     279  //!> contains still the old index after the index changed
     280  moleculeId_t oldId;
    279281
    280282  //!> reference to InstanceBoard for callbacks on subjectKilled()

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

    r62a0ee r1c0961  
    7474
    7575  connect( this, SIGNAL(clicked()), this, SLOT(wasClicked()));
    76   connect( ObservedAtom.get(), SIGNAL(indexChanged()), this, SLOT(resetIndex()));
     76  connect( ObservedAtom.get(), SIGNAL(indexChanged(const atomId_t, const atomId_t)), this, SLOT(resetIndex(const atomId_t, const atomId_t)));
    7777  connect( ObservedAtom.get(), SIGNAL(elementChanged()), this, SLOT(resetElement()));
    7878  connect( ObservedAtom.get(), SIGNAL(positionChanged()), this, SLOT(resetPosition()));
    … …  
    8787{}
    8888
    89 void GLMoleculeObject_atom::resetIndex()
     89void GLMoleculeObject_atom::resetIndex(const atomId_t, const atomId_t)
    9090{
    9191  const atomId_t newId = ObservedAtom->getAtomIndex();

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

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

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

    r62a0ee r1c0961  
    124124  connect (ObservedMolecule.get(), SIGNAL(tesselationhullChanged()), this, SLOT(resetTesselationHull()));
    125125  connect (ObservedMolecule.get(), SIGNAL(boundingboxChanged()), this, SLOT(resetBoundingBox()));
    126   connect (ObservedMolecule.get(), SIGNAL(indexChanged()), this, SLOT(resetIndex()));
    127   connect (ObservedMolecule.get(), SIGNAL(atomInserted(QtObservedAtom::ptr)), this, SLOT(atomInserted(QtObservedAtom::ptr)));
    128   connect (ObservedMolecule.get(), SIGNAL(atomRemoved(const atomId_t)), this, SLOT(atomRemoved(const atomId_t)));
     126  connect (ObservedMolecule.get(), SIGNAL(indexChanged(const moleculeId_t, const moleculeId_t)),
     127      this, SLOT(resetIndex(const moleculeId_t, const moleculeId_t)));
     128  connect (ObservedMolecule.get(), SIGNAL(atomInserted(QtObservedAtom::ptr)),
     129      this, SLOT(atomInserted(QtObservedAtom::ptr)) );
     130  connect (ObservedMolecule.get(), SIGNAL(atomRemoved(const atomId_t)),
     131      this, SLOT(atomRemoved(const atomId_t)) );
    129132  connect (ObservedMolecule.get(), SIGNAL(selectedChanged()), this, SLOT(resetSelected()));
    130133
    … …  
    246249}
    247250
    248 void GLMoleculeObject_molecule::resetIndex()
     251void GLMoleculeObject_molecule::resetIndex(const moleculeId_t, const moleculeId_t)
    249252{
    250253  const atomId_t newId = ObservedMolecule->getMolIndex();

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

    r62a0ee r1c0961  
    8989  void resetTesselationHull();
    9090  void resetBoundingBox();
    91   void resetIndex();
     91  void resetIndex(const moleculeId_t, const moleculeId_t);
    9292  void resetSelected();
    9393
Note: See TracChangeset for help on using the changeset viewer.