sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hide unimplemented GeometryV2 clip methods

Browse Source
This commit is contained in:
Nyall Dawson 2015-06-22 21:57:01 +10:00
parent 5f4933585b
commit c590e1ecee
9 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/geometry/qgsabstractgeometryv2.sip
View File

@ -92,7 +92,7 @@ class QgsAbstractGeometryV2
//render pipeline //render pipeline
virtual void transform( const QgsCoordinateTransform& ct ) = 0; virtual void transform( const QgsCoordinateTransform& ct ) = 0;
virtual void transform( const QTransform& t ) = 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; virtual void draw( QPainter& p ) const = 0;
/**Returns next vertex id and coordinates /**Returns next vertex id and coordinates

2
python/core/geometry/qgscircularstringv2.sip
View File

@ -40,7 +40,7 @@ class QgsCircularStringV2: public QgsCurveV2
void draw( QPainter& p ) const; void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct ); void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t ); void transform( const QTransform& t );
void clip( const QgsRectangle& rect ); //void clip( const QgsRectangle& rect );
void addToPainterPath( QPainterPath& path ) const; void addToPainterPath( QPainterPath& path ) const;
void drawAsPolygon( QPainter& p ) const; void drawAsPolygon( QPainter& p ) const;

2
python/core/geometry/qgsgeometrycollectionv2.sip
View File

@ -25,7 +25,7 @@ class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
virtual void transform( const QgsCoordinateTransform& ct ); virtual void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t ); void transform( const QTransform& t );
virtual void clip( const QgsRectangle& rect ); //virtual void clip( const QgsRectangle& rect );
virtual void draw( QPainter& p ) const; virtual void draw( QPainter& p ) const;
bool fromWkb( const unsigned char * wkb ); bool fromWkb( const unsigned char * wkb );

2
src/core/geometry/qgsabstractgeometryv2.cpp
View File

@ -63,6 +63,7 @@ bool QgsAbstractGeometryV2::isMeasure() const
return ( mWkbType >= 2001 && mWkbType <= 3012 ); return ( mWkbType >= 2001 && mWkbType <= 3012 );
} }
#if 0
void QgsAbstractGeometryV2::clip( const QgsRectangle& rect ) void QgsAbstractGeometryV2::clip( const QgsRectangle& rect )
{ {
// TODO // 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 // 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 ) void QgsAbstractGeometryV2::setZMTypeFromSubGeometry( const QgsAbstractGeometryV2* subgeom, QgsWKBTypes::Type baseGeomType )
{ {

2
src/core/geometry/qgsabstractgeometryv2.h
View File

@ -223,7 +223,9 @@ class CORE_EXPORT QgsAbstractGeometryV2
*/ */
virtual void transform( const QTransform& t ) = 0; virtual void transform( const QTransform& t ) = 0;
#if 0
virtual void clip( const QgsRectangle& rect ); //todo virtual void clip( const QgsRectangle& rect ); //todo
#endif
/** Draws the geometry using the specified QPainter. /** Draws the geometry using the specified QPainter.
* @param p destination QPainter * @param p destination QPainter

2
src/core/geometry/qgscircularstringv2.cpp
View File

@ -607,10 +607,12 @@ void QgsCircularStringV2::transform( const QTransform& t )
} }
} }
#if 0
void QgsCircularStringV2::clip( const QgsRectangle& rect ) void QgsCircularStringV2::clip( const QgsRectangle& rect )
{ {
//todo... //todo...
} }
#endif
void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const
{ {

2
src/core/geometry/qgscircularstringv2.h
View File

@ -69,7 +69,9 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2
void draw( QPainter& p ) const override; void draw( QPainter& p ) const override;
void transform( const QgsCoordinateTransform& ct ) override; void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override; void transform( const QTransform& t ) override;
#if 0
void clip( const QgsRectangle& rect ) override; void clip( const QgsRectangle& rect ) override;
#endif
void addToPainterPath( QPainterPath& path ) const override; void addToPainterPath( QPainterPath& path ) const override;
void drawAsPolygon( QPainter& p ) const override; void drawAsPolygon( QPainter& p ) const override;

2
src/core/geometry/qgsgeometrycollectionv2.cpp
View File

@ -148,6 +148,7 @@ void QgsGeometryCollectionV2::transform( const QTransform& t )
} }
} }
#if 0
void QgsGeometryCollectionV2::clip( const QgsRectangle& rect ) void QgsGeometryCollectionV2::clip( const QgsRectangle& rect )
{ {
QVector< QgsAbstractGeometryV2* >::iterator it = mGeometries.begin(); QVector< QgsAbstractGeometryV2* >::iterator it = mGeometries.begin();
@ -156,6 +157,7 @@ void QgsGeometryCollectionV2::clip( const QgsRectangle& rect )
( *it )->clip( rect ); ( *it )->clip( rect );
} }
} }
#endif
void QgsGeometryCollectionV2::draw( QPainter& p ) const void QgsGeometryCollectionV2::draw( QPainter& p ) const
{ {

2
src/core/geometry/qgsgeometrycollectionv2.h
View File

@ -64,7 +64,9 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2
virtual void transform( const QgsCoordinateTransform& ct ) override; virtual void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override; void transform( const QTransform& t ) override;
#if 0
virtual void clip( const QgsRectangle& rect ) override; virtual void clip( const QgsRectangle& rect ) override;
#endif
virtual void draw( QPainter& p ) const override; virtual void draw( QPainter& p ) const override;
bool fromWkb( const unsigned char * wkb ) override; bool fromWkb( const unsigned char * wkb ) override;