Add qgsgeometry_cast

Because it - is faster than dynamic_cast - doesn't rely on RTTI - encapsulates type checking in one place
qgis · Aug 12, 2017 · a6800d6 · a6800d6
1 parent 5fd19d5
commit a6800d6
Show file tree

Hide file tree

Showing 23 changed files with 301 additions and 55 deletions.
diff --git a/python/core/geometry/qgsabstractgeometry.sip b/python/core/geometry/qgsabstractgeometry.sip
@@ -28,29 +28,29 @@ class QgsAbstractGeometry
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsPoint *>( sipCpp ) != NULL )
       sipType = sipType_QgsPoint;
-    else if ( dynamic_cast<QgsLineString *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsLineString *>( sipCpp ) != NULL )
       sipType = sipType_QgsLineString;
-    else if ( dynamic_cast<QgsCircularString *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsCircularString *>( sipCpp ) != NULL )
       sipType = sipType_QgsCircularString;
-    else if ( dynamic_cast<QgsCompoundCurve *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsCompoundCurve *>( sipCpp ) != NULL )
       sipType = sipType_QgsCompoundCurve;
-    else if ( dynamic_cast<QgsTriangle *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != NULL )
       sipType = sipType_QgsTriangle;
-    else if ( dynamic_cast<QgsPolygonV2 *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != NULL )
       sipType = sipType_QgsPolygonV2;
-    else if ( dynamic_cast<QgsCurvePolygon *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != NULL )
       sipType = sipType_QgsCurvePolygon;
-    else if ( dynamic_cast<QgsMultiPointV2 *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiPointV2;
-    else if ( dynamic_cast<QgsMultiLineString *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiLineString;
-    else if ( dynamic_cast<QgsMultiPolygonV2 *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiPolygonV2;
-    else if ( dynamic_cast<QgsMultiSurface *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiSurface;
-    else if ( dynamic_cast<QgsMultiCurve *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiCurve;
-    else if ( dynamic_cast<QgsGeometryCollection *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsGeometryCollection *>( sipCpp ) != NULL )
       sipType = sipType_QgsGeometryCollection;
     else
       sipType = 0;
@@ -527,6 +527,7 @@ struct QgsVertexId
   VertexType type;
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgscurve.sip b/python/core/geometry/qgscurve.sip
@@ -156,6 +156,7 @@ class QgsCurve: QgsAbstractGeometry
 %End
 
 
+
   protected:
 
     virtual void clearCache() const;

diff --git a/python/core/geometry/qgsgeometrycollection.sip b/python/core/geometry/qgsgeometrycollection.sip
@@ -141,6 +141,7 @@ Adds a geometry and takes ownership. Returns true in case of success.
     virtual bool dropZValue();
     virtual bool dropMValue();
 
+
   protected:
 
     virtual bool wktOmitChildType() const;

diff --git a/python/core/geometry/qgsmulticurve.sip b/python/core/geometry/qgsmulticurve.sip
@@ -49,6 +49,7 @@ Adds a geometry and takes ownership. Returns true in case of success
 
     virtual QgsAbstractGeometry *boundary() const /Factory/;
 
+
 };
 
 /************************************************************************

diff --git a/python/core/geometry/qgsmultisurface.sip b/python/core/geometry/qgsmultisurface.sip
@@ -42,6 +42,8 @@ Adds a geometry and takes ownership. Returns true in case of success
 %End
 
     virtual QgsAbstractGeometry *boundary() const /Factory/;
+
+
 };
 
 /************************************************************************

diff --git a/src/core/geometry/qgsabstractgeometry.h b/src/core/geometry/qgsabstractgeometry.h
@@ -53,31 +53,31 @@ class CORE_EXPORT QgsAbstractGeometry
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
-    if ( dynamic_cast<QgsPoint *>( sipCpp ) != NULL )
+    if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != NULL )
       sipType = sipType_QgsPoint;
-    else if ( dynamic_cast<QgsLineString *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsLineString *>( sipCpp ) != NULL )
       sipType = sipType_QgsLineString;
-    else if ( dynamic_cast<QgsCircularString *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsCircularString *>( sipCpp ) != NULL )
       sipType = sipType_QgsCircularString;
-    else if ( dynamic_cast<QgsCompoundCurve *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsCompoundCurve *>( sipCpp ) != NULL )
       sipType = sipType_QgsCompoundCurve;
-    else if ( dynamic_cast<QgsTriangle *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != NULL )
       sipType = sipType_QgsTriangle;
-    else if ( dynamic_cast<QgsPolygonV2 *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != NULL )
       sipType = sipType_QgsPolygonV2;
-    else if ( dynamic_cast<QgsCurvePolygon *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != NULL )
       sipType = sipType_QgsCurvePolygon;
-    else if ( dynamic_cast<QgsMultiPointV2 *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiPointV2;
-    else if ( dynamic_cast<QgsMultiLineString *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiLineString;
-    else if ( dynamic_cast<QgsMultiPolygonV2 *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiPolygonV2;
-    else if ( dynamic_cast<QgsMultiSurface *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiSurface;
-    else if ( dynamic_cast<QgsMultiCurve *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != NULL )
       sipType = sipType_QgsMultiCurve;
-    else if ( dynamic_cast<QgsGeometryCollection *>( sipCpp ) != NULL )
+    else if ( qgsgeometry_cast<QgsGeometryCollection *>( sipCpp ) != NULL )
       sipType = sipType_QgsGeometryCollection;
     else
       sipType = 0;
@@ -132,7 +132,7 @@ class CORE_EXPORT QgsAbstractGeometry
      * \see geometryType
      * \see wktTypeStr
      */
-    QgsWkbTypes::Type wkbType() const { return mWkbType; }
+    inline QgsWkbTypes::Type wkbType() const { return mWkbType; }
 
     /** Returns the WKT type string of the geometry.
      * \see geometryType
@@ -490,4 +490,12 @@ struct CORE_EXPORT QgsVertexId
   VertexType type;
 };
 
+#ifndef SIP_RUN
+template <class T>
+inline T qgsgeometry_cast( const QgsAbstractGeometry *geom )
+{
+  return const_cast<T>( reinterpret_cast<T>( 0 )->cast( geom ) );
+}
+#endif
+
 #endif //QGSABSTRACTGEOMETRYV2
diff --git a/src/core/geometry/qgscircularstring.h b/src/core/geometry/qgscircularstring.h
@@ -114,6 +114,22 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
 
     double xAt( int index ) const override;
     double yAt( int index ) const override;
+#ifndef SIP_RUN
+
+    /**
+     * Cast the \a geom to a QgsCircularString.
+     * Should be used by qgsgeometry_cast<QgsCircularString *>( geometry ).
+     *
+     * \note Not available in Python. Objects will be automatically be converted to the appropriate target type.
+     * \since QGIS 3.0
+     */
+    inline const QgsCircularString *cast( const QgsAbstractGeometry *geom ) const
+    {
+      if ( geom && QgsWkbTypes::flatType( geom->wkbType() ) == QgsWkbTypes::CircularString )
+        return static_cast<const QgsCircularString *>( geom );
+      return nullptr;
+    }
+#endif
 
   protected:
 

diff --git a/src/core/geometry/qgscompoundcurve.cpp b/src/core/geometry/qgscompoundcurve.cpp
@@ -37,7 +37,7 @@ QgsCompoundCurve::~QgsCompoundCurve()
 
 bool QgsCompoundCurve::operator==( const QgsCurve &other ) const
 {
-  const QgsCompoundCurve *otherCurve = dynamic_cast< const QgsCompoundCurve * >( &other );
+  const QgsCompoundCurve *otherCurve = qgsgeometry_cast< const QgsCompoundCurve * >( &other );
   if ( !otherCurve )
     return false;
 

diff --git a/src/core/geometry/qgscompoundcurve.h b/src/core/geometry/qgscompoundcurve.h
@@ -126,6 +126,22 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
 
     double xAt( int index ) const override;
     double yAt( int index ) const override;
+#ifndef SIP_RUN
+
+    /**
+     * Cast the \a geom to a QgsCompoundCurve.
+     * Should be used by qgsgeometry_cast<QgsCompoundCurve *>( geometry ).
+     *
+     * \note Not available in Python. Objects will be automatically be converted to the appropriate target type.
+     * \since QGIS 3.0
+     */
+    inline const QgsCompoundCurve *cast( const QgsAbstractGeometry *geom ) const
+    {
+      if ( geom && QgsWkbTypes::flatType( geom->wkbType() ) == QgsWkbTypes::CompoundCurve )
+        return static_cast<const QgsCompoundCurve *>( geom );
+      return nullptr;
+    }
+#endif
 
   protected:
 

diff --git a/src/core/geometry/qgscurve.h b/src/core/geometry/qgscurve.h
@@ -134,6 +134,26 @@ class CORE_EXPORT QgsCurve: public QgsAbstractGeometry
      */
     QPolygonF asQPolygonF() const;
 
+#ifndef SIP_RUN
+
+    /**
+     * Cast the \a geom to a QgsCurve.
+     * Should be used by qgsgeometry_cast<QgsCurve *>( geometry ).
+     *
+     * \note Not available in Python. Objects will be automatically be converted to the appropriate target type.
+     * \since QGIS 3.0
+     */
+    inline const QgsCurve *cast( const QgsAbstractGeometry *geom ) const
+    {
+      QgsWkbTypes::Type type = geom->wkbType();
+      if ( geom && QgsWkbTypes::geometryType( type ) == QgsWkbTypes::LineGeometry && QgsWkbTypes::isSingleType( type ) )
+      {
+        return static_cast<const QgsCurve *>( geom );
+      }
+      return nullptr;
+    }
+#endif
+
 
   protected:
 

diff --git a/src/core/geometry/qgscurvepolygon.h b/src/core/geometry/qgscurvepolygon.h
@@ -140,6 +140,22 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
     virtual bool dropZValue() override;
     virtual bool dropMValue() override;
 
+#ifndef SIP_RUN
+
+    /**
+     * Cast the \a geom to a QgsCurvePolygon.
+     * Should be used by qgsgeometry_cast<QgsCurvePolygon *>( geometry ).
+     *
+     * \note Not available in Python. Objects will be automatically be converted to the appropriate target type.
+     * \since QGIS 3.0
+     */
+    inline const QgsCurvePolygon *cast( const QgsAbstractGeometry *geom ) const
+    {
+      if ( geom && QgsWkbTypes::flatType( geom->wkbType() ) == QgsWkbTypes::CurvePolygon )
+        return static_cast<const QgsCurvePolygon *>( geom );
+      return nullptr;
+    }
+#endif
   protected:
 
     QgsCurve *mExteriorRing = nullptr;