sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use 'combine' instead of 'Union' in order to preserve coding style rules (methods should be lower case). Union cant be used in lower case since it is a reserved c++ word

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9521 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2008-10-23 06:54:12 +00:00
parent daba2444b0
commit a85c1a53a3
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/qgsgeometry.sip
View File

@ -230,8 +230,10 @@ not disjoint with existing polygons of the feature*/
/** Returns a geometry representing the points shared by this geometry and other. */
QgsGeometry* intersection(QgsGeometry* geometry) /Factory/;
/** Returns a geometry representing all the points in this geometry and other. */
QgsGeometry* Union(QgsGeometry* geometry) /Factory/;
/** Returns a geometry representing all the points in this geometry and other (a
* union geometry operation).
* @note this operation is not called union since its a reserved word in C++.*/
QgsGeometry* combine( QgsGeometry* geometry );
/** Returns a geometry representing the points making up this geometry that do not make up other. */
QgsGeometry* difference(QgsGeometry* geometry) /Factory/;

2
src/core/qgsgeometry.cpp
View File

@ -5347,7 +5347,7 @@ QgsGeometry* QgsGeometry::intersection( QgsGeometry* geometry )
CATCH_GEOS( 0 )
}
QgsGeometry* QgsGeometry::Union( QgsGeometry* geometry )
QgsGeometry* QgsGeometry::combine( QgsGeometry* geometry )
{
if ( geometry == NULL )
{

6
src/core/qgsgeometry.h
View File

@ -276,8 +276,10 @@ class CORE_EXPORT QgsGeometry
/** Returns a geometry representing the points shared by this geometry and other. */
QgsGeometry* intersection( QgsGeometry* geometry );
/** Returns a geometry representing all the points in this geometry and other. */
QgsGeometry* Union( QgsGeometry* geometry );
/** Returns a geometry representing all the points in this geometry and other (a
* union geometry operation).
* @note this operation is not called union since its a reserved word in C++.*/
QgsGeometry* combine( QgsGeometry* geometry );
/** Returns a geometry representing the points making up this geometry that do not make up other. */
QgsGeometry* difference( QgsGeometry* geometry );

4
tests/src/core/testqgsgeometry.cpp
View File

@ -227,7 +227,7 @@ void TestQgsGeometry::intersectionCheck2()
void TestQgsGeometry::unionCheck1()
{
// should be a multipolygon with 2 parts as A does not intersect C
QgsGeometry * mypUnionGeometry = mpPolygonGeometryA->Union( mpPolygonGeometryC );
QgsGeometry * mypUnionGeometry = mpPolygonGeometryA->combine( mpPolygonGeometryC );
qDebug( "Geometry Type: " + wkbTypeAsString( mypUnionGeometry->wkbType() ).toLocal8Bit() );
QVERIFY( mypUnionGeometry->wkbType() == QGis::WKBMultiPolygon );
QgsMultiPolygon myMultiPolygon = mypUnionGeometry->asMultiPolygon();
@ -240,7 +240,7 @@ void TestQgsGeometry::unionCheck1()
void TestQgsGeometry::unionCheck2()
{
// should be a single polygon as A intersect B
QgsGeometry * mypUnionGeometry = mpPolygonGeometryA->Union( mpPolygonGeometryB );
QgsGeometry * mypUnionGeometry = mpPolygonGeometryA->combine( mpPolygonGeometryB );
qDebug( "Geometry Type: " + wkbTypeAsString( mypUnionGeometry->wkbType() ).toLocal8Bit() );
QVERIFY( mypUnionGeometry->wkbType() == QGis::WKBPolygon );
QgsPolygon myPolygon = mypUnionGeometry->asPolygon();