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

Fix clearing multicurve should reset dimensionality

Browse Source
This commit is contained in:
Nyall Dawson 2017-09-26 09:03:28 +10:00
parent b46d8d3d33
commit c9117fc585
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/core/geometry/qgsmulticurve.sip
View File

@ -24,25 +24,20 @@ class QgsMultiCurve: QgsGeometryCollection
virtual QgsMultiCurve *clone() const /Factory/; virtual QgsMultiCurve *clone() const /Factory/;
virtual void clear();
virtual QgsMultiCurve *toCurveType() const /Factory/; virtual QgsMultiCurve *toCurveType() const /Factory/;
virtual bool fromWkt( const QString &wkt ); virtual bool fromWkt( const QString &wkt );
virtual QDomElement asGML2( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const; virtual QDomElement asGML2( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const;
virtual QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const; virtual QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const;
virtual QString asJSON( int precision = 17 ) const; virtual QString asJSON( int precision = 17 ) const;
virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ ); virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ );
%Docstring
Adds a geometry and takes ownership. Returns true in case of success
:rtype: bool
%End
QgsMultiCurve *reversed() const /Factory/; QgsMultiCurve *reversed() const /Factory/;
%Docstring %Docstring

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

@ -38,6 +38,12 @@ QgsMultiCurve *QgsMultiCurve::clone() const
return new QgsMultiCurve( *this ); return new QgsMultiCurve( *this );
} }
void QgsMultiCurve::clear()
{
QgsGeometryCollection::clear();
mWkbType = QgsWkbTypes::MultiCurve;
}
QgsMultiCurve *QgsMultiCurve::toCurveType() const QgsMultiCurve *QgsMultiCurve::toCurveType() const
{ {
return clone(); return clone();

8
src/core/geometry/qgsmulticurve.h
View File

@ -31,18 +31,12 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection
QgsMultiCurve(); QgsMultiCurve();
QString geometryType() const override; QString geometryType() const override;
QgsMultiCurve *clone() const override SIP_FACTORY; QgsMultiCurve *clone() const override SIP_FACTORY;
void clear() override;
QgsMultiCurve *toCurveType() const override SIP_FACTORY; QgsMultiCurve *toCurveType() const override SIP_FACTORY;
bool fromWkt( const QString &wkt ) override; bool fromWkt( const QString &wkt ) override;
// inherited: int wkbSize() const;
// inherited: unsigned char* asWkb( int& binarySize ) const;
// inherited: QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override; QDomElement asGML2( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override;
QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override; QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override; QString asJSON( int precision = 17 ) const override;
//! Adds a geometry and takes ownership. Returns true in case of success
bool addGeometry( QgsAbstractGeometry *g SIP_TRANSFER ) override; bool addGeometry( QgsAbstractGeometry *g SIP_TRANSFER ) override;
/** Returns a copy of the multi curve, where each component curve has had its line direction reversed. /** Returns a copy of the multi curve, where each component curve has had its line direction reversed.