summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-06 01:44:32 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-06 01:44:32 (GMT)
commite320db210c41c1a45a88aad4c592024f433e6ad0 (patch)
tree4044c4ddccd2f707f42959b5a88292e4d17cb25a
parent60a903eed87b42f27c4d9f094d3a198fca2ee3de (diff)
downloadQt-e320db210c41c1a45a88aad4c592024f433e6ad0.zip
Qt-e320db210c41c1a45a88aad4c592024f433e6ad0.tar.gz
Qt-e320db210c41c1a45a88aad4c592024f433e6ad0.tar.bz2
Add images for the Transform documentation.
-rw-r--r--doc/src/declarative/pics/3d-axis.pngbin0 -> 13840 bytes
-rw-r--r--doc/src/declarative/pics/3d-rotation-axis.pngbin0 -> 14304 bytes
-rw-r--r--doc/src/declarative/pics/squish-transform.pngbin0 -> 9652 bytes
-rw-r--r--src/declarative/fx/qfxtransform.cpp13
4 files changed, 11 insertions, 2 deletions
diff --git a/doc/src/declarative/pics/3d-axis.png b/doc/src/declarative/pics/3d-axis.png
new file mode 100644
index 0000000..1a587ff
--- /dev/null
+++ b/doc/src/declarative/pics/3d-axis.png
Binary files differ
diff --git a/doc/src/declarative/pics/3d-rotation-axis.png b/doc/src/declarative/pics/3d-rotation-axis.png
new file mode 100644
index 0000000..1b17261
--- /dev/null
+++ b/doc/src/declarative/pics/3d-rotation-axis.png
Binary files differ
diff --git a/doc/src/declarative/pics/squish-transform.png b/doc/src/declarative/pics/squish-transform.png
new file mode 100644
index 0000000..0eb848e
--- /dev/null
+++ b/doc/src/declarative/pics/squish-transform.png
Binary files differ
diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp
index 71ca716..cc2c21c 100644
--- a/src/declarative/fx/qfxtransform.cpp
+++ b/src/declarative/fx/qfxtransform.cpp
@@ -92,8 +92,10 @@ void QFxTransform::update()
(and thus many different sets of two points could define the same axis), the distance
between the points does matter for translation along an axis.
+ \image 3d-axis.png
+
\qml
- Axis { startX: 0; startY: 0; endX: 20; endY: 30 }
+ Axis { startX: 20; startY: 0; endX: 40; endY: 60; endZ: 20 }
\endqml
*/
@@ -210,6 +212,8 @@ QFxRotation3D::~QFxRotation3D()
an end point. The z-position of the start point is assumed to be 0, and cannot
be changed.
+ \image 3d-rotation-axis.png
+
\sa Axis
*/
QFxAxis *QFxRotation3D::axis()
@@ -508,7 +512,12 @@ QMatrix4x4 QFxPerspective::transform() const
/*!
\qmlclass Squish
- \brief A Squish object allows you to distort an items appearance by 'squishing' it.
+ \brief A Squish object allows you to distort an item's appearance by 'squishing' it.
+
+ Conceptually, a Squish works by allowing you to move the four corners of an item,
+ and distorting the item to fit into the newly created polygon.
+
+ \image squish-transform.png
Here is an example of various \l Image squishes.
\qml