summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeränen Pasi <pasi.keranen@digia.com>2013-10-15 10:33:50 +0300
committerPasi Keränen <pasi.keranen@digia.com>2013-10-16 10:15:55 +0300
commitd2b02b344e1d53a4a485f016558aded484d91a75 (patch)
tree1b851b71fcef86dfd43213f8c855824e9b7ce5de
parent49cf94ebaf09c29d7f5e0a2567854765dabcb4bc (diff)
New Mac screenshots and fix to the surface minimal example.
Change-Id: Ic780e3d883a991bc7b0586bdb275a5c4710dbc7d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--src/datavisualization/doc/images/q3dbars-minimal.pngbin8611 -> 16841 bytes
-rw-r--r--src/datavisualization/doc/images/q3dscatter-minimal.pngbin7998 -> 13727 bytes
-rw-r--r--src/datavisualization/doc/images/q3dsurface-minimal.pngbin16174 -> 18691 bytes
-rw-r--r--src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp2
-rw-r--r--src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp8
-rw-r--r--src/datavisualization/engine/q3dsurface.cpp2
6 files changed, 7 insertions, 5 deletions
diff --git a/src/datavisualization/doc/images/q3dbars-minimal.png b/src/datavisualization/doc/images/q3dbars-minimal.png
index fff8d415..21dcf5b3 100644
--- a/src/datavisualization/doc/images/q3dbars-minimal.png
+++ b/src/datavisualization/doc/images/q3dbars-minimal.png
Binary files differ
diff --git a/src/datavisualization/doc/images/q3dscatter-minimal.png b/src/datavisualization/doc/images/q3dscatter-minimal.png
index 1c3290b3..fc5f8c62 100644
--- a/src/datavisualization/doc/images/q3dscatter-minimal.png
+++ b/src/datavisualization/doc/images/q3dscatter-minimal.png
Binary files differ
diff --git a/src/datavisualization/doc/images/q3dsurface-minimal.png b/src/datavisualization/doc/images/q3dsurface-minimal.png
index 119cdfb9..2ef8b104 100644
--- a/src/datavisualization/doc/images/q3dsurface-minimal.png
+++ b/src/datavisualization/doc/images/q3dsurface-minimal.png
Binary files differ
diff --git a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
index b2f48921..74691525 100644
--- a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
//! [0]
//! [1]
QScatterDataArray data;
- data << QVector3D(1.0f, 0.5f, 1.0f) << QVector3D(-1.0f, -0.5f, -1.0f) << QVector3D(0.5f, 0.0f, 0.0f);
+ data << QVector3D(0.5f, 0.5f, 0.5f) << QVector3D(-0.3f, -0.5f, -0.4f) << QVector3D(0.0f, -0.3f, 0.2f);
scatter->activeDataProxy()->addItems(data);
//! [1]
//! [2]
diff --git a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp
index 33b6cf37..67587efc 100644
--- a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp
@@ -30,12 +30,14 @@ int main(int argc, char **argv)
//! [0]
//! [1]
QSurfaceDataArray *data = new QSurfaceDataArray;
- QSurfaceDataRow *dataRow = new QSurfaceDataRow;
+ QSurfaceDataRow *dataRow1 = new QSurfaceDataRow;
+ QSurfaceDataRow *dataRow2 = new QSurfaceDataRow;
//! [1]
//! [2]
- *dataRow << 0.1 << 1.8 << 0.4;
- *data << dataRow;
+ *dataRow1 << QVector3D(0.0f, 0.1f, 0.5f) << QVector3D(1.0f, 0.5f, 0.5f);
+ *dataRow2 << QVector3D(0.0f, 1.8f, 1.0f) << QVector3D(1.0f, 1.2f, 1.0f);
+ *data << dataRow1 << dataRow2;
//! [2]
//! [3]
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 7d06e5c2..2a6506e1 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -66,7 +66,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
*
* \snippet doc_src_q3dsurface_construction.cpp 1
*
- * First feed the data to the row element and then add it's pointer to the data element:
+ * First feed the data to the row elements and then add their pointers to the data element:
*
* \snippet doc_src_q3dsurface_construction.cpp 2
*