Use different timers for updating scene and rendering frame.

OpenModelica · Nov 10, 2016 · 153b56c · 153b56c
1 parent f793884
commit 153b56c
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 195 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp b/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp
@@ -51,7 +51,6 @@ AnimationWindow::AnimationWindow(PlotWindowContainer *pPlotWindowContainer)
     mpSceneView(new osgViewer::View()),
     mpVisualizer(nullptr),
     mpViewerWidget(nullptr),
-    mpUpdateTimer(new QTimer()),
     mpAnimationToolBar(new QToolBar(QString("Animation Toolbar"),this)),
     mpFMUSettingsDialog(nullptr),
     mpAnimationChooseFileAction(nullptr),
@@ -63,14 +62,16 @@ AnimationWindow::AnimationWindow(PlotWindowContainer *pPlotWindowContainer)
   this->setObjectName(QString("animationWidget"));
   // the osg threading model
   setThreadingModel(osgViewer::CompositeViewer::SingleThreaded);
+  // disable the default setting of viewer.done() by pressing Escape.
+  setKeyEventSetsDone(0);
   //the viewer widget
   mpViewerWidget = setupViewWidget();
   // we need to set the minimum height so that visualization window is still shown when we cascade windows.
   mpViewerWidget->setMinimumHeight(100);
-  // let timer do a scene update at every tick
-  QObject::connect(mpUpdateTimer, SIGNAL(timeout()), this, SLOT(updateSceneFunction()));
-  QObject::connect(mpUpdateTimer, SIGNAL(timeout()), this, SLOT(renderSlotFunction()));
-  mpUpdateTimer->start(100);
+  // let render timer do a render frame at every tick
+  mRenderFrameTimer.setInterval(100);
+  QObject::connect(&mRenderFrameTimer, SIGNAL(timeout()), this, SLOT(renderFrame()));
+  mRenderFrameTimer.start();
   // actions and widgets for the toolbar
   int toolbarIconSize = mpPlotWindowContainer->getMainWindow()->getOptionsDialog()->getGeneralSettingsPage()->getToolbarIconSizeSpinBox()->value();
   mpAnimationChooseFileAction = new QAction(QIcon(":/Resources/icons/open.svg"), Helper::animationChooseFile, this);
@@ -284,6 +285,7 @@ void AnimationWindow::loadVisualization()
     mpPlotWindowContainer->getMainWindow()->getMessagesWidget()->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, msg,
                                                                                            Helper::scriptingKind, Helper::errorLevel));
   } else {
+    connect(mpVisualizer->getTimeManager()->getUpdateSceneTimer(), SIGNAL(timeout()), SLOT(updateScene()));
     mpVisualizer->initData();
     mpVisualizer->setUpScene();
     mpVisualizer->initVisualization();
@@ -375,7 +377,7 @@ void AnimationWindow::initSlotFunction()
  * \brief AnimationWindow::updateSceneFunction
  * updates the visualization objects
  */
-void AnimationWindow::updateSceneFunction()
+void AnimationWindow::updateScene()
 {
   if (!(mpVisualizer == NULL)) {
     //set time label
@@ -395,10 +397,10 @@ void AnimationWindow::updateSceneFunction()
 }
 
 /*!
- * \brief AnimationWindow::renderSlotFunction
+ * \brief AnimationWindow::renderFrame
  * renders the osg viewer
  */
-void AnimationWindow::renderSlotFunction()
+void AnimationWindow::renderFrame()
 {
   frame();
 }

diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.h b/OMEdit/OMEditGUI/Animation/AnimationWindow.h
@@ -81,11 +81,11 @@ public slots:
   void playSlotFunction();
   void pauseSlotFunction();
   void initSlotFunction();
-  void renderSlotFunction();
+  void updateScene();
+  void renderFrame();
   void chooseAnimationFileSlotFunction();
   void setSpeedSlotFunction();
   void jumpToTimeSlotFunction();
-  void updateSceneFunction();
   void resetCamera();
   void cameraPositionXY();
   void cameraPositionXZ();
@@ -103,7 +103,7 @@ public slots:
   VisualizerAbstract* mpVisualizer;
   //widgets
   QWidget* mpViewerWidget;
-  QTimer* mpUpdateTimer;
+  QTimer mRenderFrameTimer;
   QToolBar* mpAnimationToolBar;
   QSlider* mpAnimationSlider;
   QLabel *mpAnimationTimeLabel;

diff --git a/OMEdit/OMEditGUI/Animation/TimeManager.cpp b/OMEdit/OMEditGUI/Animation/TimeManager.cpp
@@ -35,18 +35,20 @@
 #include "TimeManager.h"
 
 TimeManager::TimeManager(const double simTime, const double realTime, const double realTimeFactor, const double visTime,
-             const double hVisual, const double startTime, const double endTime)
-    : _simTime(simTime),
-      _realTime(realTime),
-      _realTimeFactor(realTimeFactor),
-      _visTime(visTime),
-      _hVisual(hVisual),
-      _startTime(startTime),
-      _endTime(endTime),
-      _pause(true),
-      mSpeedUp(1.0),
-      _visualTimer()
-{
+                         const double hVisual, const double startTime, const double endTime)
+  : _simTime(simTime),
+    _realTime(realTime),
+    _realTimeFactor(realTimeFactor),
+    _visTime(visTime),
+    _hVisual(hVisual),
+    _startTime(startTime),
+    _endTime(endTime),
+    _pause(true),
+    mSpeedUp(1.0),
+    _visualTimer()
+{
+  mpUpdateSceneTimer = new QTimer;
+  mpUpdateSceneTimer->setInterval(100);
 }
 
 void TimeManager::updateTick()
@@ -110,7 +112,6 @@ void TimeManager::setHVisual(const double hVis)
   _hVisual = hVis;
 }
 
-
 double TimeManager::getRealTime() const
 {
   return _realTime;
@@ -134,7 +135,13 @@ bool TimeManager::isPaused() const
 void TimeManager::setPause(const bool status)
 {
   _pause = status;
+  if (status) {
+    mpUpdateSceneTimer->stop();
+  } else {
+    mpUpdateSceneTimer->start();
+  }
 }
+
 void TimeManager::setSpeedUp(double value)
 {
   mSpeedUp = value;
@@ -144,4 +151,3 @@ double TimeManager::getSpeedUp()
 {
   return mSpeedUp;
 }
-
diff --git a/OMEdit/OMEditGUI/Animation/TimeManager.h b/OMEdit/OMEditGUI/Animation/TimeManager.h
@@ -39,6 +39,7 @@
 
 #include <osg/Timer>
 
+#include <QTimer>
 
 class TimeManager
 {
@@ -88,6 +89,7 @@ class TimeManager
   int getTimeFraction();
   void setSpeedUp(double value);
   double getSpeedUp();
+  QTimer* getUpdateSceneTimer() {return mpUpdateSceneTimer;}
 
  private:
   //! Time of the current simulation step.
@@ -108,7 +110,7 @@ class TimeManager
   bool _pause;
   double mSpeedUp;
   osg::Timer _visualTimer;
-
+  QTimer *mpUpdateSceneTimer;
 };