Ignore:
Timestamp:
Feb 11, 2016, 8:06:49 AM (10 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, Candidate_v1.7.0, 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:
5d8f4f
Parents:
7f1865d
git-author:
Frederik Heber <heber@…> (12/28/15 15:09:49)
git-committer:
Frederik Heber <heber@…> (02/11/16 08:06:49)
Message:

FIX: AtomObserver was not up-to-date with respect to atom's channels.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Atom/AtomObserver.cpp

    r7f1865d r4a328f  
    5353  Observable::insertNotificationChannel( std::make_pair(static_cast<Observable *>(this), OurChannel) );
    5454  OurChannel->addChannel(AtomObservable::PositionChanged);
     55  OurChannel->addChannel(AtomObservable::VelocityChanged);
     56  OurChannel->addChannel(AtomObservable::ForceChanged);
     57  OurChannel->addChannel(AtomObservable::MoleculeChanged);
     58  OurChannel->addChannel(AtomObservable::NameChanged);
    5559  OurChannel->addChannel(AtomObservable::ElementChanged);
     60  OurChannel->addChannel(AtomObservable::IndexChanged);
     61  OurChannel->addChannel(AtomObservable::PropertyChanged);
     62  OurChannel->addChannel(AtomObservable::BondsAdded);
     63  OurChannel->addChannel(AtomObservable::BondsRemoved);
    5664  OurChannel->addChannel(AtomObservable::TrajectoryChanged);
     65  OurChannel->addChannel(AtomObservable::SelectionChanged);
    5766}
    5867
     
    7079{
    7180  res->signOn(this, AtomObservable::PositionChanged);
     81  res->signOn(this, AtomObservable::VelocityChanged);
     82  res->signOn(this, AtomObservable::ForceChanged);
     83  res->signOn(this, AtomObservable::MoleculeChanged);
     84  res->signOn(this, AtomObservable::NameChanged);
    7285  res->signOn(this, AtomObservable::ElementChanged);
     86  res->signOn(this, AtomObservable::IndexChanged);
     87  res->signOn(this, AtomObservable::PropertyChanged);
     88  res->signOn(this, AtomObservable::BondsAdded);
     89  res->signOn(this, AtomObservable::BondsRemoved);
    7390  res->signOn(this, AtomObservable::TrajectoryChanged);
     91  res->signOn(this, AtomObservable::SelectionChanged);
    7492}
    7593
     
    8199{
    82100  res->signOff(this, AtomObservable::PositionChanged);
     101  res->signOff(this, AtomObservable::VelocityChanged);
     102  res->signOff(this, AtomObservable::ForceChanged);
     103  res->signOff(this, AtomObservable::MoleculeChanged);
     104  res->signOff(this, AtomObservable::NameChanged);
    83105  res->signOff(this, AtomObservable::ElementChanged);
     106  res->signOff(this, AtomObservable::IndexChanged);
     107  res->signOff(this, AtomObservable::PropertyChanged);
     108  res->signOff(this, AtomObservable::BondsAdded);
     109  res->signOff(this, AtomObservable::BondsRemoved);
    84110  res->signOff(this, AtomObservable::TrajectoryChanged);
     111  res->signOff(this, AtomObservable::SelectionChanged);
    85112}
    86113
Note: See TracChangeset for help on using the changeset viewer.