Hide unimplemented GeometryV2 clip methods

nyalldawson · nyalldawson · commit c590e1eceec9 · 2015-06-22T22:20:27.000+10:00
diff --git a/python/core/geometry/qgsabstractgeometryv2.sip b/python/core/geometry/qgsabstractgeometryv2.sip
@@ -92,7 +92,7 @@ class QgsAbstractGeometryV2
     //render pipeline
     virtual void transform( const QgsCoordinateTransform& ct ) = 0;
     virtual void transform( const QTransform& t ) = 0;
-    virtual void clip( const QgsRectangle& rect );
+    //virtual void clip( const QgsRectangle& rect );
     virtual void draw( QPainter& p ) const = 0;
 
     /**Returns next vertex id and coordinates
diff --git a/python/core/geometry/qgscircularstringv2.sip b/python/core/geometry/qgscircularstringv2.sip
@@ -40,7 +40,7 @@ class QgsCircularStringV2: public QgsCurveV2
     void draw( QPainter& p ) const;
     void transform( const QgsCoordinateTransform& ct );
     void transform( const QTransform& t );
-    void clip( const QgsRectangle& rect );
+    //void clip( const QgsRectangle& rect );
     void addToPainterPath( QPainterPath& path ) const;
     void drawAsPolygon( QPainter& p ) const;
 
diff --git a/python/core/geometry/qgsgeometrycollectionv2.sip b/python/core/geometry/qgsgeometrycollectionv2.sip
@@ -25,7 +25,7 @@ class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
 
     virtual void transform( const QgsCoordinateTransform& ct );
     void transform( const QTransform& t );
-    virtual void clip( const QgsRectangle& rect );
+    //virtual void clip( const QgsRectangle& rect );
     virtual void draw( QPainter& p ) const;
 
     bool fromWkb( const unsigned char * wkb );
diff --git a/src/core/geometry/qgsabstractgeometryv2.cpp b/src/core/geometry/qgsabstractgeometryv2.cpp
@@ -63,6 +63,7 @@ bool QgsAbstractGeometryV2::isMeasure() const
   return ( mWkbType >= 2001 && mWkbType <= 3012 );
 }
 
+#if 0
 void QgsAbstractGeometryV2::clip( const QgsRectangle& rect )
 {
   // TODO
@@ -71,6 +72,7 @@ void QgsAbstractGeometryV2::clip( const QgsRectangle& rect )
 
   // Don't insert Q_UNUSED, so we have a warning that reminds us of this TODO
 }
+#endif
 
 void QgsAbstractGeometryV2::setZMTypeFromSubGeometry( const QgsAbstractGeometryV2* subgeom, QgsWKBTypes::Type baseGeomType )
 {
diff --git a/src/core/geometry/qgsabstractgeometryv2.h b/src/core/geometry/qgsabstractgeometryv2.h
@@ -223,7 +223,9 @@ class CORE_EXPORT QgsAbstractGeometryV2
      */
     virtual void transform( const QTransform& t ) = 0;
 
+#if 0
     virtual void clip( const QgsRectangle& rect ); //todo
+#endif
 
     /** Draws the geometry using the specified QPainter.
      * @param p destination QPainter
diff --git a/src/core/geometry/qgscircularstringv2.cpp b/src/core/geometry/qgscircularstringv2.cpp
@@ -607,10 +607,12 @@ void QgsCircularStringV2::transform( const QTransform& t )
   }
 }
 
+#if 0
 void QgsCircularStringV2::clip( const QgsRectangle& rect )
 {
   //todo...
 }
+#endif
 
 void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const
 {
diff --git a/src/core/geometry/qgscircularstringv2.h b/src/core/geometry/qgscircularstringv2.h
@@ -69,7 +69,9 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2
     void draw( QPainter& p ) const override;
     void transform( const QgsCoordinateTransform& ct ) override;
     void transform( const QTransform& t ) override;
+#if 0
     void clip( const QgsRectangle& rect ) override;
+#endif
     void addToPainterPath( QPainterPath& path ) const override;
     void drawAsPolygon( QPainter& p ) const override;
 
diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollectionv2.cpp
@@ -148,6 +148,7 @@ void QgsGeometryCollectionV2::transform( const QTransform& t )
   }
 }
 
+#if 0
 void QgsGeometryCollectionV2::clip( const QgsRectangle& rect )
 {
   QVector< QgsAbstractGeometryV2* >::iterator it = mGeometries.begin();
@@ -156,6 +157,7 @@ void QgsGeometryCollectionV2::clip( const QgsRectangle& rect )
     ( *it )->clip( rect );
   }
 }
+#endif
 
 void QgsGeometryCollectionV2::draw( QPainter& p ) const
 {
diff --git a/src/core/geometry/qgsgeometrycollectionv2.h b/src/core/geometry/qgsgeometrycollectionv2.h
@@ -64,7 +64,9 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2
 
     virtual void transform( const QgsCoordinateTransform& ct ) override;
     void transform( const QTransform& t ) override;
+#if 0
     virtual void clip( const QgsRectangle& rect ) override;
+#endif
     virtual void draw( QPainter& p ) const override;
 
     bool fromWkb( const unsigned char * wkb ) override;

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ bool QgsAbstractGeometryV2::isMeasure() const`
`63`	`63`	`return ( mWkbType >= 2001 && mWkbType <= 3012 );`
`64`	`64`	`}`
`65`	`65`
	`66`	`+#if 0`
`66`	`67`	`void QgsAbstractGeometryV2::clip( const QgsRectangle& rect )`
`67`	`68`	`{`
`68`	`69`	`// TODO`
`@@ -71,6 +72,7 @@ void QgsAbstractGeometryV2::clip( const QgsRectangle& rect )`
`71`	`72`
`72`	`73`	`// Don't insert Q_UNUSED, so we have a warning that reminds us of this TODO`
`73`	`74`	`}`
	`75`	`+#endif`
`74`	`76`
`75`	`77`	`void QgsAbstractGeometryV2::setZMTypeFromSubGeometry( const QgsAbstractGeometryV2* subgeom, QgsWKBTypes::Type baseGeomType )`
`76`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -607,10 +607,12 @@ void QgsCircularStringV2::transform( const QTransform& t )`
`607`	`607`	`}`
`608`	`608`	`}`
`609`	`609`
	`610`	`+#if 0`
`610`	`611`	`void QgsCircularStringV2::clip( const QgsRectangle& rect )`
`611`	`612`	`{`
`612`	`613`	`//todo...`
`613`	`614`	`}`
	`615`	`+#endif`
`614`	`616`
`615`	`617`	`void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const`
`616`	`618`	`{`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ void QgsGeometryCollectionV2::transform( const QTransform& t )`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
	`151`	`+#if 0`
`151`	`152`	`void QgsGeometryCollectionV2::clip( const QgsRectangle& rect )`
`152`	`153`	`{`
`153`	`154`	`QVector< QgsAbstractGeometryV2* >::iterator it = mGeometries.begin();`
`@@ -156,6 +157,7 @@ void QgsGeometryCollectionV2::clip( const QgsRectangle& rect )`
`156`	`157`	`( *it )->clip( rect );`
`157`	`158`	`}`
`158`	`159`	`}`
	`160`	`+#endif`
`159`	`161`
`160`	`162`	`void QgsGeometryCollectionV2::draw( QPainter& p ) const`
`161`	`163`	`{`