Changeset ff1696

Timestamp:

Aug 9, 2017, 10:21:27 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued

Children:

35364f0

Parents:

78830b

Message:

FIX: QTimeLine now exactly controls world time.

Location:

src/UIElements/Views/Qt4

Files:

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

src/UIElements/Views/Qt4/QtTimeLine.cpp

@@ -50 +50 @@
     Observer("QtTimeLine"),
     atomobserver_enlisted(false),
-    worldtime_enlisted(false),
-    WorldTime_change(false)
+    worldtime_enlisted(false)
 {
   // set initial values
   QSlider::setMinimum(0);
   QSlider::setMaximum(0);
-  WorldTime_change = true;
   QSlider::setValue(0);
   QSlider::setTickInterval(1);
@@ -69 +67 @@
 
   // connect to QSlider's valueChanged() signal
-  bool result = connect(this,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)), Qt::DirectConnection);
+  bool result = connect(this,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)));
   if (!result)
     ELOG(0, "Could not connect to QSlider::valueChanged.");
@@ -116 +114 @@
       QSlider::setMaximum(timestep);
     // set slider position to new time step
-    WorldTime_change = true;
     QSlider::setValue( timestep );
   } else
@@ -133 +130 @@
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-  if (WorldTime_change)
-    WorldTime_change = false;
-  else
+  if (WorldTime::getTime() != (unsigned int)position)
     MoleCuilder::WorldSetWorldTime(position);
 }

src/UIElements/Views/Qt4/QtTimeLine.hpp

@@ -42 +42 @@
   //!> whether WorldTime knows about us or not
   bool worldtime_enlisted;
-  //!> states whether value was set by observing WorldTime (and not by slider)
-  bool WorldTime_change;
 
   mutable boost::recursive_mutex refill_mutex;