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

fixup! sfcgal: add buffer like operations

Browse Source
This commit is contained in:
bdm-oslandia 2025-07-21 09:08:40 +02:00 committed by Nyall Dawson
parent cb61367ccd
commit 65ba76b0e7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/geometry/qgssfcgalgeometry.cpp
View File

@ -360,21 +360,21 @@ bool QgsSfcgalGeometry::intersects( const QgsSfcgalGeometry &otherGeom, QString
return out; return out;
} }
QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters &parameters ) const QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
{ {
sfcgal::errorHandler()->clearText( errorMsg ); sfcgal::errorHandler()->clearText( errorMsg );
sfcgal::shared_geom otherShared = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, errorMsg ); sfcgal::shared_geom otherShared = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, errorMsg );
CHECK_SUCCESS( errorMsg, nullptr ); CHECK_SUCCESS( errorMsg, nullptr );
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherShared.get(), errorMsg, parameters ); sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherShared.get(), errorMsg );
CHECK_SUCCESS( errorMsg, nullptr ); CHECK_SUCCESS( errorMsg, nullptr );
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release(); return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
} }
QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters &parameters ) const QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
{ {
sfcgal::errorHandler()->clearText( errorMsg ); sfcgal::errorHandler()->clearText( errorMsg );
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg, parameters ); sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg );
CHECK_SUCCESS( errorMsg, nullptr ); CHECK_SUCCESS( errorMsg, nullptr );
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release(); return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
} }
@ -397,22 +397,22 @@ QgsSfcgalGeometry *QgsSfcgalGeometry::combine( const QVector<const QgsAbstractGe
; ;
} }
QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters &parameters ) const QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
{ {
sfcgal::errorHandler()->clearText( errorMsg ); sfcgal::errorHandler()->clearText( errorMsg );
sfcgal::shared_geom otherSharedr = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, errorMsg ); sfcgal::shared_geom otherSharedr = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, errorMsg );
CHECK_SUCCESS( errorMsg, nullptr ); CHECK_SUCCESS( errorMsg, nullptr );
sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherSharedr.get(), errorMsg, parameters ); sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherSharedr.get(), errorMsg );
CHECK_SUCCESS( errorMsg, nullptr ); CHECK_SUCCESS( errorMsg, nullptr );
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release(); return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
} }
QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters &parameters ) const QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
{ {
sfcgal::errorHandler()->clearText( errorMsg ); sfcgal::errorHandler()->clearText( errorMsg );
sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg, parameters ); sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg );
CHECK_SUCCESS( errorMsg, nullptr ); CHECK_SUCCESS( errorMsg, nullptr );
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release(); return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
} }