Introduce fps measurement via properties

Task-number: QTRD-2134

Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 40 insertions, 1 deletions

diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 8f3c56b9..703cd18b 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -363,7 +363,8 @@ bool QAbstract3DGraph::shadowsSupported() const
 /*!
  * \property QAbstract3DGraph::scene
  *
- * This property contains the read only Q3DScene that can be used to access, for example, a camera object.
+ * This property contains the read only Q3DScene that can be used to access, for example, a camera
+ * object.
  */
 Q3DScene *QAbstract3DGraph::scene() const
 {
@@ -404,6 +405,39 @@ QImage QAbstract3DGraph::renderToImage(int msaaSamples, const QSize &imageSize)
  */
 
 /*!
+ * \property QAbstract3DGraph::measureFps
+ * \since Qt Data Visualization 1.1
+ *
+ * If \c true, the rendering is done continuously instead of on demand, and currentFps property
+ * is updated. Defaults to false.
+ *
+ * \sa currentFps
+ */
+void QAbstract3DGraph::setMeasureFps(bool enable)
+{
+    d_ptr->m_visualController->setMeasureFps(enable);
+}
+
+bool QAbstract3DGraph::measureFps() const
+{
+    return d_ptr->m_visualController->measureFps();
+}
+
+/*!
+ * \property QAbstract3DGraph::currentFps
+ * \since Qt Data Visualization 1.1
+ *
+ * When fps measuring is enabled, the results for the last second are stored in this read-only
+ * property. It takes at least a second before this value updates after measurement is activated.
+ *
+ * \sa measureFps
+ */
+qreal QAbstract3DGraph::currentFps() const
+{
+    return d_ptr->m_visualController->currentFps();
+}
+
+/*!
  * \internal
  */
 bool QAbstract3DGraph::event(QEvent *event)
@@ -540,6 +574,11 @@ void QAbstract3DGraphPrivate::setVisualController(Abstract3DController *controll
                      &QAbstract3DGraphPrivate::handleAxisYChanged);
     QObject::connect(m_visualController, &Abstract3DController::axisZChanged, this,
                      &QAbstract3DGraphPrivate::handleAxisZChanged);
+
+    QObject::connect(m_visualController, &Abstract3DController::measureFpsChanged, q_ptr,
+                     &QAbstract3DGraph::measureFpsChanged);
+    QObject::connect(m_visualController, &Abstract3DController::currentFpsChanged, q_ptr,
+                     &QAbstract3DGraph::currentFpsChanged);
 }
 
 void QAbstract3DGraphPrivate::handleDevicePixelRatioChange()