Changeset 25ce49 for src

Timestamp:

Oct 5, 2013, 9:31:54 AM (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:

38112d

Parents:

f130d4

git-author:

Frederik Heber <heber@…> (09/07/13 11:46:45)

git-committer:

Frederik Heber <heber@…> (10/05/13 09:31:54)

Message:

FIX: QtTimeLine was not notified of TimeChanged of WorldTime.

• hence, if some other code changes the time, the slider does not get updated.

Location:

src/UIElements/Views/Qt4

Files:

• QtTimeLine.cpp (modified) (5 diffs)
• QtTimeLine.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtTimeLine.cpp

@@ -44 +44 @@
 #include "Atom/atom.hpp"
 #include "Atom/AtomObserver.hpp"
+#include "WorldTime.hpp"
 
 QtTimeLine::QtTimeLine(QWidget * _parent) :
     QSlider (Qt::Horizontal, _parent),
-    Observer("QtTimeLine")
+    Observer("QtTimeLine"),
+    worldtime_enlisted(false),
+    atomobserver_enlisted(false)
 {
   // set initial values
@@ -58 +61 @@
 
   // sign on to observable
+  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
+  worldtime_enlisted = true;
   AtomObserver::getInstance().signOn(this, AtomObservable::TrajectoryChanged);
-  enlisted = true;
+  atomobserver_enlisted = true;
 
   // connect to QSlider's valueChanged() signal
@@ -69 +74 @@
 QtTimeLine::~QtTimeLine()
 {
-  if (enlisted)
+  if (worldtime_enlisted)
+    WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
+  if (atomobserver_enlisted)
     AtomObserver::getInstance().signOff(this, AtomObservable::TrajectoryChanged);
 }
@@ -75 +82 @@
 void QtTimeLine::subjectKilled(Observable *publisher)
 {
-  enlisted = false;
+  // as long as we are enlisted to only one channel, we have nothing to worry.
+  // Otherwise we should also signOn to global changes for subjectKilled() and
+  // sign off from the channels
+  if (static_cast<AtomObserver *>(publisher) == AtomObserver::getPointer()) {
+    atomobserver_enlisted = false;
+  } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+    worldtime_enlisted = false;
+ }
 }
 
@@ -85 +99 @@
 void QtTimeLine::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  // 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);
+  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()) {
+    const unsigned int timestep = WorldTime::getTime();
+    // check whether we are beyond maximum
+    if (timestep > QSlider::maximum())
+      QSlider::setMaximum(timestep);
+    // set slider position to new time step
+    QSlider::setValue( timestep );
+  }
 }
 

src/UIElements/Views/Qt4/QtTimeLine.hpp

@@ -35 +35 @@
 private:
   //!> whether AtomObserver knows about us or not
-  bool enlisted;
+  bool atomobserver_enlisted;
+  //!> whether WorldTime knows about us or not
+  bool worldtime_enlisted;
 };