Changeset 8d56a6 for src/UIElements/Views/Qt4/QtTimeLine.cpp

Timestamp:

Jun 21, 2018, 8:31:25 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1, Candidate_v1.7.0, ChemicalSpaceEvaluator, stable

Children:

d83d64, f5ea10

Parents:

3e334e (diff), 4fc0ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'TremoloParser_IncreasedPrecision' into Candidate_v1.6.1

Conflicts:

tests/Python/ForceAnnealing/post/five_carbon_test_bondgraph.data
tests/Python/ForceAnnealing/post/five_carbon_test_no-bondgraph.data

File:

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

src/UIElements/Views/Qt4/QtTimeLine.cpp

@@ -47 +47 @@
 
 QtTimeLine::QtTimeLine(QWidget * _parent) :
-    QSlider (Qt::Horizontal, _parent),
+    QWidget(_parent),
     Observer("QtTimeLine"),
     atomobserver_enlisted(false),
     worldtime_enlisted(false),
-    WorldTime_change(false)
+    SetWorldTime_called(false)
 {
+  slider = new QSlider(Qt::Horizontal, this);
   // set initial values
-  QSlider::setMinimum(0);
-  QSlider::setMaximum(0);
-  WorldTime_change = true;
-  QSlider::setValue(0);
-  QSlider::setTickInterval(1);
-  QSlider::setSingleStep(1);
-  QSlider::setTracking(true);
+  slider->setMinimum(0);
+  slider->setMaximum(0);
+  slider->setValue(0);
+  slider->setTickInterval(1);
+  slider->setSingleStep(1);
+  slider->setTracking(true);
+
+  spinbox = new QSpinBox(this);
+  spinbox->setMinimum(0);
+  spinbox->setMaximum(0);
+  spinbox->setValue(0);
+
+  layout = new QHBoxLayout(this);
+  layout->addWidget(slider);
+  layout->addWidget(spinbox);
 
   // sign on to observable
@@ -69 +78 @@
 
   // connect to QSlider's valueChanged() signal
-  bool result = connect(this,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)), Qt::DirectConnection);
+  bool result = connect(slider,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)));
+  result = result && connect(spinbox,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)));
   if (!result)
     ELOG(0, "Could not connect to QSlider::valueChanged.");
@@ -86 +96 @@
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-  QSlider::paintEvent(event);
+//  layout->paintEvent(event);
 }
 
@@ -111 +121 @@
 
   if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+    SetWorldTime_called = false;
     const int timestep = WorldTime::getTime();
     // check whether we are beyond maximum
-    if (timestep > QSlider::maximum())
-      QSlider::setMaximum(timestep);
+    if (timestep > slider->maximum()) {
+      slider->setMaximum(timestep);
+      spinbox->setMaximum(timestep);
+    }
     // set slider position to new time step
-    WorldTime_change = true;
-    QSlider::setValue( timestep );
+    slider->setValue( timestep );
+    spinbox->setValue( timestep );
   } else
     //if (static_cast<AtomObserver *>(publisher) == AtomObserver::getPointer())
@@ -124 +137 @@
     const atom *_atom = dynamic_cast<const atom *>(publisher);
     const int MaxTrajectory = _atom->getTrajectorySize()-1;
-    if (MaxTrajectory > QSlider::maximum())
-      QSlider::setMaximum(MaxTrajectory);
+    if (MaxTrajectory > slider->maximum()) {
+      slider->setMaximum(MaxTrajectory);
+      spinbox->setMaximum(MaxTrajectory);
+    }
   }
 }
@@ -133 +148 @@
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-  if (WorldTime_change)
-    WorldTime_change = false;
-  else
-    MoleCuilder::WorldSetWorldTime(position);
+  if (!SetWorldTime_called) {
+    if (WorldTime::getTime() != (unsigned int)position) {
+      SetWorldTime_called = true;
+      MoleCuilder::WorldSetWorldTime(position);
+    }
+  }
 }