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

Fix clearing multisurface should reset dimensionality

Browse Source
This commit is contained in:
Nyall Dawson 2017-09-26 10:58:32 +10:00
parent 31730f43be
commit 4d989f8fb6
6 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,8 @@ class QgsMultiPolygonV2: QgsMultiSurface
QgsMultiPolygonV2();
virtual QString geometryType() const;
virtual void clear();
virtual QgsMultiPolygonV2 *clone() const /Factory/;

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

@ -22,6 +22,8 @@ class QgsMultiSurface: QgsGeometryCollection
QgsMultiSurface();
virtual QString geometryType() const;
virtual void clear();
virtual QgsMultiSurface *clone() const /Factory/;
virtual QgsMultiSurface *toCurveType() const /Factory/;

6
src/core/geometry/qgsmultipolygon.cpp
View File

@ -33,6 +33,12 @@ QString QgsMultiPolygonV2::geometryType() const
return QStringLiteral( "MultiPolygon" );
}
void QgsMultiPolygonV2::clear()
{
QgsMultiSurface::clear();
mWkbType = QgsWkbTypes::MultiPolygon;
}
QgsMultiPolygonV2 *QgsMultiPolygonV2::clone() const
{
return new QgsMultiPolygonV2( *this );

1
src/core/geometry/qgsmultipolygon.h
View File

@ -30,6 +30,7 @@ class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurface
public:
QgsMultiPolygonV2();
QString geometryType() const override;
void clear() override;
QgsMultiPolygonV2 *clone() const override SIP_FACTORY;
bool fromWkt( const QString &wkt ) override;

6
src/core/geometry/qgsmultisurface.cpp
View File

@ -34,6 +34,12 @@ QString QgsMultiSurface::geometryType() const
return QStringLiteral( "MultiSurface" );
}
void QgsMultiSurface::clear()
{
QgsGeometryCollection::clear();
mWkbType = QgsWkbTypes::MultiSurface;
}
QgsMultiSurface *QgsMultiSurface::clone() const
{
return new QgsMultiSurface( *this );

1
src/core/geometry/qgsmultisurface.h
View File

@ -30,6 +30,7 @@ class CORE_EXPORT QgsMultiSurface: public QgsGeometryCollection
public:
QgsMultiSurface();
QString geometryType() const override;
void clear() override;
QgsMultiSurface *clone() const override SIP_FACTORY;
QgsMultiSurface *toCurveType() const override SIP_FACTORY;
bool fromWkt( const QString &wkt ) override;