add __repr__ for more geometry classes and add test

3nids · 3nids · commit cc3e29bcc2fe · 2018-06-19T07:02:17.000-04:00
diff --git a/python/core/auto_additions/qgscircle.py b/python/core/auto_additions/qgscircle.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgscircle.h
+QgsCircle.__repr__ = lambda self: '<QgsPoint {}>'.format(self.toString())
diff --git a/python/core/auto_additions/qgscircularstring.py b/python/core/auto_additions/qgscircularstring.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgscircularstring.h
+QgsCircularString.__repr__ = lambda self: '<QgsCircularString {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgscompoundcurve.py b/python/core/auto_additions/qgscompoundcurve.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgscompoundcurve.h
+QgsCompoundCurve.__repr__ = lambda self: '<QgsCompoundCurve {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgscurvepolygon.py b/python/core/auto_additions/qgscurvepolygon.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgscurvepolygon.h
+QgsCurvePolygon.__repr__ = lambda self: '<QgsCurvePolygon {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgsellipse.py b/python/core/auto_additions/qgsellipse.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsellipse.h
+QgsEllipse.__repr__ = lambda self: '<QgsEllipse {}>'.format(self.toString())
diff --git a/python/core/auto_additions/qgsgeometry.py b/python/core/auto_additions/qgsgeometry.py
@@ -2,3 +2,4 @@
 QgsGeometry.BufferSide.baseClass = QgsGeometry
 QgsGeometry.EndCapStyle.baseClass = QgsGeometry
 QgsGeometry.JoinStyle.baseClass = QgsGeometry
+QgsGeometry.__repr__ = lambda self: '<QgsGeometry {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgslinestring.py b/python/core/auto_additions/qgslinestring.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgslinestring.h
+QgsLineString.__repr__ = lambda self: '<QgsLineString {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgsmulticurve.py b/python/core/auto_additions/qgsmulticurve.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsmulticurve.h
+QgsMultiCurve.__repr__ = lambda self: '<QgsMulitCurve {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgsmultilinestring.py b/python/core/auto_additions/qgsmultilinestring.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsmultilinestring.h
+QgsMultiLineString.__repr__ = lambda self: '<QgsMultiLineString {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgsmultipoint.py b/python/core/auto_additions/qgsmultipoint.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsmultipoint.h
+QgsMultiPoint.__repr__ = lambda self: '<QgsMultiPoint {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgsmultipolygon.py b/python/core/auto_additions/qgsmultipolygon.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsmultipolygon.h
+QgsMultiPolygon.__repr__ = lambda self: '<QgsMultiPolygon {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgspolygon.py b/python/core/auto_additions/qgspolygon.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgspolygon.h
+QgsPolygon.__repr__ = lambda self: '<QgsPolygon {}>'.format(self.asWkt())
diff --git a/python/core/auto_additions/qgsrectangle.py b/python/core/auto_additions/qgsrectangle.py
@@ -0,0 +1,2 @@
+# The following has been generated automatically from src/core/geometry/qgsrectangle.h
+QgsRectangle.__repr__ = lambda self: '<QgsRectangle {}>'.format(self.asWktCoordinates())
diff --git a/python/core/auto_generated/geometry/qgscircle.sip.in b/python/core/auto_generated/geometry/qgscircle.sip.in
@@ -253,6 +253,7 @@ Returns true if the circle contains the ``point``.
     virtual QString toString( int pointPrecision = 17, int radiusPrecision = 17, int azimuthPrecision = 2 ) const;
 
 
+
 };
 
 /************************************************************************
diff --git a/python/core/auto_generated/geometry/qgscircularstring.sip.in b/python/core/auto_generated/geometry/qgscircularstring.sip.in
@@ -162,6 +162,7 @@ Sets the circular string's points
     virtual QgsCircularString *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual QgsRectangle calculateBoundingBox() const;
diff --git a/python/core/auto_generated/geometry/qgscompoundcurve.sip.in b/python/core/auto_generated/geometry/qgscompoundcurve.sip.in
@@ -166,6 +166,7 @@ Appends first point if not already closed.
     virtual QgsCompoundCurve *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual QgsRectangle calculateBoundingBox() const;
diff --git a/python/core/auto_generated/geometry/qgscurvepolygon.sip.in b/python/core/auto_generated/geometry/qgscurvepolygon.sip.in
@@ -216,6 +216,7 @@ Returns approximate rotation angle for a vertex. Usually average angle between a
     virtual QgsCurvePolygon *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual int childCount() const;
diff --git a/python/core/auto_generated/geometry/qgsellipse.sip.in b/python/core/auto_generated/geometry/qgsellipse.sip.in
@@ -248,6 +248,7 @@ returns a string representation of the ellipse.
 Members will be truncated to the specified precision.
 %End
 
+
   protected:
 
 };
diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in
@@ -1290,6 +1290,7 @@ Exports the geometry to WKT
    precision parameter added in QGIS 2.4
 %End
 
+
     QString asJson( int precision = 17 ) const;
 %Docstring
 Exports the geometry to a GeoJSON string.
diff --git a/python/core/auto_generated/geometry/qgslinestring.sip.in b/python/core/auto_generated/geometry/qgslinestring.sip.in
@@ -317,6 +317,7 @@ of the curve.
     virtual QgsLineString *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual QgsRectangle calculateBoundingBox() const;
diff --git a/python/core/auto_generated/geometry/qgsmulticurve.sip.in b/python/core/auto_generated/geometry/qgsmulticurve.sip.in
@@ -57,6 +57,7 @@ Returns a copy of the multi curve, where each component curve has had its line d
 
 
 
+
 };
 
 
diff --git a/python/core/auto_generated/geometry/qgsmultilinestring.sip.in b/python/core/auto_generated/geometry/qgsmultilinestring.sip.in
@@ -53,6 +53,7 @@ Returns the geometry converted to the more generic curve type :py:class:`QgsMult
     virtual QgsMultiLineString *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual bool wktOmitChildType() const;
diff --git a/python/core/auto_generated/geometry/qgsmultipoint.sip.in b/python/core/auto_generated/geometry/qgsmultipoint.sip.in
@@ -55,6 +55,7 @@ Multi point geometry collection.
     virtual QgsMultiPoint *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual bool wktOmitChildType() const;
diff --git a/python/core/auto_generated/geometry/qgsmultipolygon.sip.in b/python/core/auto_generated/geometry/qgsmultipolygon.sip.in
@@ -54,6 +54,7 @@ Returns the geometry converted to the more generic curve type :py:class:`QgsMult
     virtual QgsMultiPolygon *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
     virtual bool wktOmitChildType() const;
diff --git a/python/core/auto_generated/geometry/qgspolygon.sip.in b/python/core/auto_generated/geometry/qgspolygon.sip.in
@@ -65,6 +65,7 @@ negative if the point lies outside the polygon.
     virtual QgsPolygon *createEmptyWithSameType() const /Factory/;
 
 
+
   protected:
 
 
diff --git a/python/core/auto_generated/geometry/qgsrectangle.sip.in b/python/core/auto_generated/geometry/qgsrectangle.sip.in
@@ -322,6 +322,7 @@ Converts the rectangle to a 3D box, with the specified
 
     operator QVariant() const;
 
+
 };
 
 
diff --git a/python/core/auto_generated/qgspointxy.sip.in b/python/core/auto_generated/qgspointxy.sip.in
@@ -122,7 +122,6 @@ Returns a string representation of the point (x, y) with a preset ``precision``.
 If  ``precision`` is -1, then a default precision will be used.
 %End
 
-
     QString asWkt() const;
 %Docstring
 Returns the well known text representation for the point (e.g. "POINT(x y)").
diff --git a/scripts/sipify_all.sh b/scripts/sipify_all.sh
@@ -39,6 +39,16 @@ count=0
 
 modules=(core gui analysis server)
 for module in "${modules[@]}"; do
+
+  # clean auto_additions and auto_generated folders
+  rm -rf python/${module}/auto_additions/*.py
+  rm -rf python/${module}/auto_generated/*.py
+  # put back __init__.py
+  echo '"""
+This folder is completed using sipify.pl script
+It is not aimed to be manually edited
+"""' > python/${module}/auto_additions/__init__.py
+
   while read -r sipfile; do
       echo "$sipfile.in"
       header=$(${GP}sed -E 's@(.*)\.sip@src/\1.h@; s@auto_generated/@@' <<< $sipfile)
diff --git a/src/core/geometry/qgscircle.h b/src/core/geometry/qgscircle.h
@@ -247,6 +247,8 @@ class CORE_EXPORT QgsCircle : public QgsEllipse
 
     QString toString( int pointPrecision = 17, int radiusPrecision = 17, int azimuthPrecision = 2 ) const override;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsPoint {}>'.format(self.toString())" )
+
 };
 
 #endif // QGSCIRCLE_H
diff --git a/src/core/geometry/qgscircularstring.h b/src/core/geometry/qgscircularstring.h
@@ -146,6 +146,8 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
 
     QgsCircularString *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsCircularString {}>'.format(self.asWkt())" )
+
   protected:
 
     QgsRectangle calculateBoundingBox() const override;
diff --git a/src/core/geometry/qgscompoundcurve.h b/src/core/geometry/qgscompoundcurve.h
@@ -146,6 +146,8 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
 
     QgsCompoundCurve *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsCompoundCurve {}>'.format(self.asWkt())" )
+
   protected:
 
     QgsRectangle calculateBoundingBox() const override;
diff --git a/src/core/geometry/qgscurvepolygon.h b/src/core/geometry/qgscurvepolygon.h
@@ -204,6 +204,8 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
 
     QgsCurvePolygon *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsCurvePolygon {}>'.format(self.asWkt())" )
+
   protected:
 
     int childCount() const override;
diff --git a/src/core/geometry/qgsellipse.h b/src/core/geometry/qgsellipse.h
@@ -240,6 +240,8 @@ class CORE_EXPORT QgsEllipse
      */
     virtual QString toString( int pointPrecision = 17, int axisPrecision = 17, int azimuthPrecision = 2 ) const;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsEllipse {}>'.format(self.toString())" )
+
   protected:
     QgsPoint mCenter;
     double mSemiMajorAxis = 0.0;
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -1248,6 +1248,8 @@ class CORE_EXPORT QgsGeometry
      */
     QString asWkt( int precision = 17 ) const;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsGeometry {}>'.format(self.asWkt())" )
+
     /**
      * Exports the geometry to a GeoJSON string.
      */
diff --git a/src/core/geometry/qgslinestring.h b/src/core/geometry/qgslinestring.h
@@ -346,6 +346,8 @@ class CORE_EXPORT QgsLineString: public QgsCurve
 
     QgsLineString *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsLineString {}>'.format(self.asWkt())" )
+
   protected:
 
     QgsRectangle calculateBoundingBox() const override;
diff --git a/src/core/geometry/qgsmulticurve.h b/src/core/geometry/qgsmulticurve.h
@@ -73,6 +73,8 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection
 
     QgsMultiCurve *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsMulitCurve {}>'.format(self.asWkt())" )
+
 
 };
 
diff --git a/src/core/geometry/qgsmultilinestring.h b/src/core/geometry/qgsmultilinestring.h
@@ -65,6 +65,8 @@ class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve
 
     QgsMultiLineString *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsMultiLineString {}>'.format(self.asWkt())" )
+
   protected:
 
     bool wktOmitChildType() const override;
diff --git a/src/core/geometry/qgsmultipoint.h b/src/core/geometry/qgsmultipoint.h
@@ -66,6 +66,8 @@ class CORE_EXPORT QgsMultiPoint: public QgsGeometryCollection
 
     QgsMultiPoint *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsMultiPoint {}>'.format(self.asWkt())" )
+
   protected:
 
     bool wktOmitChildType() const override;
diff --git a/src/core/geometry/qgsmultipolygon.h b/src/core/geometry/qgsmultipolygon.h
@@ -65,6 +65,8 @@ class CORE_EXPORT QgsMultiPolygon: public QgsMultiSurface
 
     QgsMultiPolygon *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsMultiPolygon {}>'.format(self.asWkt())" )
+
   protected:
 
     bool wktOmitChildType() const override;
diff --git a/src/core/geometry/qgspolygon.h b/src/core/geometry/qgspolygon.h
@@ -84,6 +84,8 @@ class CORE_EXPORT QgsPolygon: public QgsCurvePolygon
 
     QgsPolygon *createEmptyWithSameType() const override SIP_FACTORY;
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsPolygon {}>'.format(self.asWkt())" )
+
   protected:
 
     friend class QgsCurvePolygon;
diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h
@@ -541,6 +541,8 @@ class CORE_EXPORT QgsRectangle
       return QVariant::fromValue( *this );
     }
 
+    SIP_PYTHON_SPECIAL_REPR( "'<QgsRectange {}>'.format(self.asWktCoordinates())" )
+
   private:
 
     double mXmin = 0.0;
diff --git a/src/core/qgspointxy.h b/src/core/qgspointxy.h
@@ -156,8 +156,6 @@ class CORE_EXPORT QgsPointXY
      */
     QString toString( int precision = -1 ) const;
 
-    SIP_PYTHON_SPECIAL_REPR( "'<QgsPointXY {}>'.format(self.toString())" )
-
     /**
      * Returns the well known text representation for the point (e.g. "POINT(x y)").
      * The wkt is created without an SRID.
diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt
@@ -9,6 +9,7 @@ IF (WITH_SERVER)
 ENDIF (WITH_SERVER)
 
 ADD_PYTHON_TEST(PyCoreAdittions test_core_additions.py)
+ADD_PYTHON_TEST(PyPythonRepr test_python_repr.py)
 ADD_PYTHON_TEST(PyQgsActionManager test_qgsactionmanager.py)
 ADD_PYTHON_TEST(PyQgsAFSProvider test_provider_afs.py)
 ADD_PYTHON_TEST(PyQgsPythonProvider test_provider_python.py)
diff --git a/tests/src/python/test_python_repr.py b/tests/src/python/test_python_repr.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# The following has been generated automatically from src/core/geometry/qgscircle.h`
	`2`	`+QgsCircle.__repr__ = lambda self: '<QgsPoint {}>'.format(self.toString())`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# The following has been generated automatically from src/core/geometry/qgscircularstring.h`
	`2`	`+QgsCircularString.__repr__ = lambda self: '<QgsCircularString {}>'.format(self.asWkt())`