Document the rendering changes

Change-Id: I100a516f6f5d8047b88f6d81cd8794979211df20
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

11 files changed, 26 insertions, 46 deletions

diff --git a/examples/datavisualization/qmlbars/main.cpp b/examples/datavisualization/qmlbars/main.cpp
index a42218ae..966d068a 100644
--- a/examples/datavisualization/qmlbars/main.cpp
+++ b/examples/datavisualization/qmlbars/main.cpp
@@ -16,8 +16,6 @@
 **
 ****************************************************************************/
 
-#include <QtDataVisualization/qutils.h>
-
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
@@ -29,9 +27,6 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
-    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
-
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
diff --git a/examples/datavisualization/qmlcustominput/main.cpp b/examples/datavisualization/qmlcustominput/main.cpp
index 08cbf26d..d4658d41 100644
--- a/examples/datavisualization/qmlcustominput/main.cpp
+++ b/examples/datavisualization/qmlcustominput/main.cpp
@@ -16,8 +16,6 @@
 **
 ****************************************************************************/
 
-#include <QtDataVisualization/qutils.h>
-
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
@@ -29,9 +27,6 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
-    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
-
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
diff --git a/examples/datavisualization/qmllegend/main.cpp b/examples/datavisualization/qmllegend/main.cpp
index a3bc1590..62016770 100644
--- a/examples/datavisualization/qmllegend/main.cpp
+++ b/examples/datavisualization/qmllegend/main.cpp
@@ -16,8 +16,6 @@
 **
 ****************************************************************************/
 
-#include <QtDataVisualization/qutils.h>
-
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
@@ -29,9 +27,6 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
-    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
-
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
diff --git a/examples/datavisualization/qmlmultigraph/main.cpp b/examples/datavisualization/qmlmultigraph/main.cpp
index 270e5274..ef53d5ec 100644
--- a/examples/datavisualization/qmlmultigraph/main.cpp
+++ b/examples/datavisualization/qmlmultigraph/main.cpp
@@ -16,8 +16,6 @@
 **
 ****************************************************************************/
 
-#include <QtDataVisualization/qutils.h>
-
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
@@ -29,9 +27,6 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
-    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
-
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
index e5a84b86..c574950b 100644
--- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
+++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
@@ -107,4 +107,20 @@
     DataSource at requested intervals. The label update is also triggered on each cycle:
 
     \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 3
+
+    \section1 Enabling direct rendering
+
+    Since this application potentially deals with a lot of rapidly changing data, we use direct
+    rendering mode for performance. To enable antialiasing in this mode the surface format of the application
+    window needs to be changed, as the default format used by QQuickView doesn't support antialiasing.
+    We use the utility function provided by Qt Data Visualization to change the surface format
+    in \c main.cpp:
+
+    \snippet qmloscilloscope/main.cpp 1
+    \dots 0
+    \snippet qmloscilloscope/main.cpp 2
+
+    On the QML side, direct rendering mode is enabled via \l{AbstractGraph3D::renderingMode}{renderingMode} property:
+
+    \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 5
 */
diff --git a/examples/datavisualization/qmloscilloscope/main.cpp b/examples/datavisualization/qmloscilloscope/main.cpp
index 3e99c4a0..9ee46e21 100644
--- a/examples/datavisualization/qmloscilloscope/main.cpp
+++ b/examples/datavisualization/qmloscilloscope/main.cpp
@@ -17,7 +17,10 @@
 ****************************************************************************/
 
 #include "datasource.h"
+
+//! [2]
 #include <QtDataVisualization/qutils.h>
+//! [2]
 
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
@@ -31,8 +34,10 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
+    // Enable antialiasing in direct rendering mode
+    //! [1]
     viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
+    //! [1]
 
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml
index 6034109b..eeaeab40 100644
--- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml
+++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml
@@ -49,6 +49,9 @@ Item {
             height: dataView.height
             shadowQuality: AbstractGraph3D.ShadowQualityNone
             selectionMode: AbstractGraph3D.SelectionSlice | AbstractGraph3D.SelectionItemAndRow
+            //! [5]
+            renderingMode: AbstractGraph3D.RenderDirectToBackground
+            //! [5]
 
             axisX.labelFormat: "%d ms"
             axisY.labelFormat: "%d W"
diff --git a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
index ec11970f..177cf7c1 100644
--- a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
+++ b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
@@ -35,16 +35,6 @@
 
     Before diving into the QML code, let's take a look at the application \c main.cpp.
 
-    Anti-aliasing for Qt Data Visualization graphs in Qt Quick 2 is not supported by default due
-    to technological limitations. To enable anti-aliasing, a custom surface format must be set to
-    the QQuickWindow we are using to show the application in the application \c main.cpp:
-
-    \snippet qmlscatter/main.cpp 1
-    \dots 0
-    \snippet qmlscatter/main.cpp 0
-
-    This will make the graphs nicer to look at.
-
     This application implements a 'Quit' button in the UI, so we want to connect the QQmlEngine::quit()
     signal to our application's QWindow::close() slot:
 
diff --git a/examples/datavisualization/qmlscatter/main.cpp b/examples/datavisualization/qmlscatter/main.cpp
index 425becd5..11684c84 100644
--- a/examples/datavisualization/qmlscatter/main.cpp
+++ b/examples/datavisualization/qmlscatter/main.cpp
@@ -16,10 +16,6 @@
 **
 ****************************************************************************/
 
-//! [1]
-#include <QtDataVisualization/qutils.h>
-//! [1]
-
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
@@ -31,11 +27,6 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
-    //! [0]
-    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
-    //! [0]
-
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
diff --git a/examples/datavisualization/qmlsurface/main.cpp b/examples/datavisualization/qmlsurface/main.cpp
index 348533bb..71d79a2b 100644
--- a/examples/datavisualization/qmlsurface/main.cpp
+++ b/examples/datavisualization/qmlsurface/main.cpp
@@ -16,8 +16,6 @@
 **
 ****************************************************************************/
 
-#include <QtDataVisualization/qutils.h>
-
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
 #include <QtQuick/QQuickView>
@@ -29,9 +27,6 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
-    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
-
     // The following are needed to make examples run without having to install the module
     // in desktop environments.
 #ifdef Q_OS_WIN
diff --git a/examples/datavisualization/qmlsurfacelayers/main.cpp b/examples/datavisualization/qmlsurfacelayers/main.cpp
index fc7393e6..eb895dd1 100644
--- a/examples/datavisualization/qmlsurfacelayers/main.cpp
+++ b/examples/datavisualization/qmlsurfacelayers/main.cpp
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
 
     QQuickView viewer;
 
-    // Enable antialiasing
+    // Enable antialiasing in direct rendering mode
     viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
 
     // The following are needed to make examples run without having to install the module