Skip to content
Permalink
Browse files

Hide unimplemented GeometryV2 clip methods

  • Loading branch information
nyalldawson committed Jun 22, 2015
1 parent 5f49335 commit c590e1eceec94853ddf9d89cd36a5fbf0ea375da
@@ -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
@@ -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;

@@ -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 );
@@ -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 )
{
@@ -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
@@ -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
{
@@ -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;

@@ -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
{
@@ -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;

0 comments on commit c590e1e

Please sign in to comment.
You can’t perform that action at this time.