Changeset 3a33e3 for src/UIElements

Timestamp:

Aug 20, 2014, 12:58:30 PM (11 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:

3b35e7, 4d6d6a, fc3aff

Parents:

45cdce6

git-author:

Frederik Heber <heber@…> (08/14/14 09:05:32)

git-committer:

Frederik Heber <heber@…> (08/20/14 12:58:30)

Message:

FIX: QtTimeLine::recieveNotification() checked falsely against AtomObserver.

• publisher is always the atom, not the relay.
• that's why the time line did not get updated when a molecule with more than one timestep was loaded.

File:

• src/UIElements/Views/Qt4/QtTimeLine.cpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtTimeLine.cpp

@@ -99 +99 @@
 void QtTimeLine::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  if (static_cast<AtomObserver *>(publisher) == AtomObserver::getPointer()) {
-    // calculate max trajectory (need dynamic_cast due to virtual base)
-    const atom *_atom = dynamic_cast<const atom *>(publisher);
-    const int MaxTrajectory = _atom->getTrajectorySize()-1;
-    if (MaxTrajectory > QSlider::maximum())
-      QSlider::setMaximum(MaxTrajectory);
-  } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+  if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
     const int timestep = WorldTime::getTime();
     // check whether we are beyond maximum
@@ -112 +106 @@
     // set slider position to new time step
     QSlider::setValue( timestep );
+  } else
+    //if (static_cast<AtomObserver *>(publisher) == AtomObserver::getPointer())
+  {
+    // calculate max trajectory (need dynamic_cast due to virtual base)
+    const atom *_atom = dynamic_cast<const atom *>(publisher);
+    const int MaxTrajectory = _atom->getTrajectorySize()-1;
+    if (MaxTrajectory > QSlider::maximum())
+      QSlider::setMaximum(MaxTrajectory);
   }
 }