Merge pull request #5719 from nyalldawson/translate_z

geometries: translate Z/M

Author: nyalldawson

python/core/geometry/qgsabstractgeometry.sip

@@ -234,10 +234,13 @@ class QgsAbstractGeometry
  transform.
 %End
 
-    virtual void transform( const QTransform &t ) = 0;
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0,
+                            double mTranslate = 0.0, double mScale = 1.0 ) = 0;
 %Docstring
- Transforms the geometry using a QTransform object
- \param t QTransform transformation
+ Transforms the x and y components of the geometry using a QTransform object ``t``.
+
+ Optionally, the geometry's z values can be scaled via ``zScale`` and translated via ``zTranslate``.
+ Similarly, m-values can be scaled via ``mScale`` and translated via ``mTranslate``.
 %End
 
     virtual void draw( QPainter &p ) const = 0;

python/core/geometry/qgscircularstring.sip

@@ -87,7 +87,7 @@ class QgsCircularString: QgsCurve
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
                     bool transformZ = false );
-    virtual void transform( const QTransform &t );
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 
     virtual void addToPainterPath( QPainterPath &path ) const;
 

python/core/geometry/qgscompoundcurve.sip

@@ -112,7 +112,7 @@ class QgsCompoundCurve: QgsCurve
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
                     bool transformZ = false );
-    virtual void transform( const QTransform &t );
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 
     virtual void addToPainterPath( QPainterPath &path ) const;
 

python/core/geometry/qgscurvepolygon.sip

@@ -131,7 +131,7 @@ Adds an interior ring to the geometry (takes ownership)
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
                     bool transformZ = false );
-    virtual void transform( const QTransform &t );
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 
 
     virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex );

python/core/geometry/qgsgeometry.sip

@@ -566,9 +566,9 @@ Returns true if WKB of the geometry is of WKBMulti* type
  :rtype: QgsGeometry
 %End
 
-    OperationResult translate( double dx, double dy );
+    OperationResult translate( double dx, double dy, double dz = 0.0, double dm = 0.0 );
 %Docstring
- Translates this geometry by dx, dy
+ Translates this geometry by dx, dy, dz and dm.
  :return: OperationResult a result code: success or reason of failure
  :rtype: OperationResult
 %End
@@ -580,9 +580,13 @@ Returns true if WKB of the geometry is of WKBMulti* type
  :rtype: OperationResult
 %End
 
-    OperationResult transform( const QTransform &ct );
+    OperationResult transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 %Docstring
- Transforms this geometry as described by QTransform ct
+ Transforms the x and y components of the geometry using a QTransform object ``t``.
+
+ Optionally, the geometry's z values can be scaled via ``zScale`` and translated via ``zTranslate``.
+ Similarly, m-values can be scaled via ``mScale`` and translated via ``mTranslate``.
+
  :return: OperationResult a result code: success or reason of failure
  :rtype: OperationResult
 %End

python/core/geometry/qgsgeometrycollection.sip

@@ -83,7 +83,7 @@ Adds a geometry and takes ownership. Returns true in case of success.
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
                     bool transformZ = false );
-    virtual void transform( const QTransform &t );
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 
 
     virtual void draw( QPainter &p ) const;

python/core/geometry/qgslinestring.sip

@@ -225,7 +225,7 @@ Closes the line string by appending the first point to the end of the line, if i
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
                     bool transformZ = false );
-    virtual void transform( const QTransform &t );
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 
 
     virtual void addToPainterPath( QPainterPath &path ) const;

python/core/geometry/qgspoint.sip

@@ -359,7 +359,7 @@ class QgsPoint: QgsAbstractGeometry
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
                     bool transformZ = false );
-    virtual void transform( const QTransform &t );
+    virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
 
     virtual QgsCoordinateSequence coordinateSequence() const;
 

python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py

@@ -143,7 +143,6 @@
 from .TextToFloat import TextToFloat
 from .TinInterpolation import TinInterpolation
 from .TopoColors import TopoColor
-from .Translate import Translate
 from .TruncateTable import TruncateTable
 from .Union import Union
 from .UniqueValues import UniqueValues
@@ -268,7 +267,6 @@ def getAlgs(self):
                 TextToFloat(),
                 TinInterpolation(),
                 TopoColor(),
-                Translate(),
                 TruncateTable(),
                 Union(),
                 UniqueValues(),