Changeset 2c97ad

Timestamp:

Apr 11, 2018, 6:29:57 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1, ChemicalSpaceEvaluator, Gui_displays_atomic_force_velocity, PythonUI_with_named_parameters, TremoloParser_IncreasedPrecision

Children:

8819d2

Parents:

8c5e2a

git-author:

Frederik Heber <frederik.heber@…> (08/09/17 15:36:42)

git-committer:

Frederik Heber <frederik.heber@…> (04/11/18 06:29:57)

Message:

QtTimeLine has an additional QSpinBox.

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.hpp (modified) (3 diffs)
• Views/Qt4/QtTimeLine.cpp (modified) (6 diffs)
• Views/Qt4/QtTimeLine.hpp (modified) (3 diffs)

src/UIElements/Qt4/QtMainWindow.hpp

@@ -32 +32 @@
 class QtMoleculeList;
 class QtShapeController;
+class QtTimeLine;
 class StringView;
 class GLWorldView;
@@ -38 +39 @@
 class QtToolBar;
 class QCloseEvent;
-class QSlider;
 
 class QtObservedInstanceBoard;
@@ -70 +70 @@
   QtMenu<QMenuBar> *MainMenu;
   QtToolBar *toolbar;
-  QSlider *timeline;
+  QtTimeLine *timeline;
   QtLogBox *logBox;
   QtLogBox *errorlogBox;

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_enlisted(false),
+    SetWorldTime_called(false)
 {
+  slider = new QSlider(Qt::Horizontal, this);
   // set initial values
-  QSlider::setMinimum(0);
-  QSlider::setMaximum(0);
-  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
@@ -67 +78 @@
 
   // connect to QSlider's valueChanged() signal
-  bool result = connect(this,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)));
+  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.");
@@ -84 +96 @@
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-  QSlider::paintEvent(event);
+//  layout->paintEvent(event);
 }
 
@@ -109 +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
-    QSlider::setValue( timestep );
+    slider->setValue( timestep );
+    spinbox->setValue( timestep );
   } else
     //if (static_cast<AtomObserver *>(publisher) == AtomObserver::getPointer())
@@ -121 +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);
+    }
   }
 }
@@ -130 +148 @@
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-  if (WorldTime::getTime() != (unsigned int)position)
-    MoleCuilder::WorldSetWorldTime(position);
+  if (!SetWorldTime_called) {
+    if (WorldTime::getTime() != (unsigned int)position) {
+      SetWorldTime_called = true;
+      MoleCuilder::WorldSetWorldTime(position);
+    }
+  }
 }

src/UIElements/Views/Qt4/QtTimeLine.hpp

@@ -14 +14 @@
 #endif
 
+#include <QtGui/QHBoxLayout>
 #include <QtGui/QSlider>
+#include <QtGui/QSpinBox>
 
 #include <boost/thread/recursive_mutex.hpp>
@@ -20 +22 @@
 #include "CodePatterns/Observer/Observer.hpp"
 
-class QtTimeLine : public QSlider, public Observer
+class QtTimeLine : public QWidget, public Observer
 {
   Q_OBJECT
@@ -43 +45 @@
   bool worldtime_enlisted;
 
+  QSlider *slider;
+  QSpinBox *spinbox;
+  QHBoxLayout *layout;
+
+  //!> states whether we are expecting a notification from the worldtime
+  bool SetWorldTime_called;
+
   mutable boost::recursive_mutex refill_mutex;
 };