Changeset 846 for trunk/src/gui/painting/qtransform.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qtransform.cpp (modified) (18 diffs)

trunk/src/gui/painting/qtransform.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 #include "qvariant.h"
 #include <qmath.h>
+
 
 #include <private/qbezier_p.h>
@@ -148 +149 @@
     QPaintDevice has its origin located at the top-left position. The
     \e x values increase to the right; \e y values increase
-    downward. For a complete description, see the \l {The Coordinate
-    System}{coordinate system} documentation.
+    downward. For a complete description, see the \l {Coordinate
+    System}{coordinate system} documentation.
 
     QPainter has functions to translate, scale, shear and rotate the
@@ -223 +224 @@
     \endtable
 
-    \sa QPainter, {The Coordinate System}, {demos/affine}{Affine
+    \sa QPainter, {Coordinate System}, {demos/affine}{Affine
     Transformations Demo}, {Transformations Example}
 */
@@ -411 +412 @@
     if (dx == 0 && dy == 0)
         return *this;
+
+
+
+
+
+
 
     switch(inline_type()) {
@@ -448 +455 @@
 QTransform QTransform::fromTranslate(qreal dx, qreal dy)
 {
+
+
+
+
+
+
     QTransform transform(1, 0, 0, 0, 1, 0, dx, dy, 1, true);
     if (dx == 0 && dy == 0)
@@ -467 +480 @@
     if (sx == 1 && sy == 1)
         return *this;
+
+
+
+
+
+
 
     switch(inline_type()) {
@@ -502 +521 @@
 QTransform QTransform::fromScale(qreal sx, qreal sy)
 {
+
+
+
+
+
+
     QTransform transform(sx, 0, 0, 0, sy, 0, 0, 0, 1, true);
     if (sx == 1. && sy == 1.)
@@ -521 +546 @@
     if (sh == 0 && sv == 0)
         return *this;
+
+
+
+
+
+
 
     switch(inline_type()) {
@@ -576 +607 @@
     if (a == 0)
         return *this;
+
+
+
+
+
+
 
     qreal sina = 0;
@@ -661 +698 @@
 QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis)
 {
+
+
+
+
+
+
     qreal sina = qSin(a);
     qreal cosa = qCos(a);
@@ -986 +1029 @@
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {s}
 */
 QDataStream & operator<<(QDataStream &s, const QTransform &m)
@@ -1010 +1053 @@
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {s}
 */
 QDataStream & operator>>(QDataStream &s, QTransform &t)
@@ -1038 +1081 @@
 QDebug operator<<(QDebug dbg, const QTransform &m)
 {
-    dbg.nospace() << "QTransform("
-                  << "11="  << m.m11()
+    static const char *typeStr[] =
+    {
+        "TxNone",
+        "TxTranslate",
+        "TxScale",
+        "TxRotate",
+        "TxShear",
+        "TxProject"
+    };
+
+    dbg.nospace() << "QTransform(type=" << typeStr[m.type()] << ','
+                  << " 11=" << m.m11()
                   << " 12=" << m.m12()
                   << " 13=" << m.m13()
@@ -1049 +1102 @@
                   << " 33=" << m.m33()
                   << ')';
+
     return dbg.space();
 }
@@ -1492 +1546 @@
     return true;
 }
+
 
 static inline bool cubicTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, const QPointF &c, const QPointF &d, bool needsMoveTo)
@@ -1497 +1552 @@
     // Convert projective xformed curves to line
     // segments so they can be transformed more accurately
-    QPolygonF segment = QBezier::fromPoints(a, b, c, d).toPolygon();
+
+    qreal scale;
+    qt_scaleForTransform(transform, &scale);
+
+    qreal curveThreshold = scale == 0 ? qreal(0.25) : (qreal(0.25) / scale);
+
+    QPolygonF segment = QBezier::fromPoints(a, b, c, d).toPolygon(curveThreshold);
 
     for (int i = 0; i < segment.size() - 1; ++i)
@@ -1566 +1627 @@
 {
     TransformationType t = inline_type();
-    if (t == TxNone || path.isEmpty())
+    if (t == TxNone || path.)
         return path;