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

qgssfcgalgeometry: Remove unused parameter in intersection methods

Browse Source
This commit is contained in:
Jean Felder 2025-08-05 19:06:53 +02:00 committed by Nyall Dawson
parent 4df0b9014f
commit e84e6fe84b
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in
View File

@ -517,13 +517,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the
geometry. geometry.
%End %End
std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsAbstractGeometry *otherGeom ) const;
%Docstring %Docstring
Calculate the intersection of this and ``otherGeom``. Calculate the intersection of this and ``otherGeom``.
:param otherGeom: geometry to perform the operation :param otherGeom: geometry to perform the operation
:param parameters: can be used to specify parameters which control the
intersection results
:return: new geometry :return: new geometry
@ -532,13 +530,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the
returned geometry. returned geometry.
%End %End
std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsSfcgalGeometry &otherGeom ) const;
%Docstring %Docstring
Calculate the intersection of this and ``otherGeom``. Calculate the intersection of this and ``otherGeom``.
:param otherGeom: geometry to perform the operation :param otherGeom: geometry to perform the operation
:param parameters: can be used to specify parameters which control the
intersection results
:return: new geometry :return: new geometry

8
python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in
View File

@ -517,13 +517,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the
geometry. geometry.
%End %End
std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsAbstractGeometry *otherGeom ) const;
%Docstring %Docstring
Calculate the intersection of this and ``otherGeom``. Calculate the intersection of this and ``otherGeom``.
:param otherGeom: geometry to perform the operation :param otherGeom: geometry to perform the operation
:param parameters: can be used to specify parameters which control the
intersection results
:return: new geometry :return: new geometry
@ -532,13 +530,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the
returned geometry. returned geometry.
%End %End
std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsSfcgalGeometry &otherGeom ) const;
%Docstring %Docstring
Calculate the intersection of this and ``otherGeom``. Calculate the intersection of this and ``otherGeom``.
:param otherGeom: geometry to perform the operation :param otherGeom: geometry to perform the operation
:param parameters: can be used to specify parameters which control the
intersection results
:return: new geometry :return: new geometry

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

@ -390,7 +390,7 @@ bool QgsSfcgalGeometry::intersects( const QgsSfcgalGeometry &otherGeom ) const
return out; return out;
} }
std::unique_ptr<QgsSfcgalGeometry> QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters & ) const std::unique_ptr<QgsSfcgalGeometry> QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom ) const
{ {
sfcgal::errorHandler()->clearText( &mLastError ); sfcgal::errorHandler()->clearText( &mLastError );
sfcgal::shared_geom otherShared = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, &mLastError ); sfcgal::shared_geom otherShared = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, &mLastError );
@ -404,7 +404,7 @@ std::unique_ptr<QgsSfcgalGeometry> QgsSfcgalGeometry::intersection( const QgsAbs
return resultGeom; return resultGeom;
} }
std::unique_ptr<QgsSfcgalGeometry> QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters & ) const std::unique_ptr<QgsSfcgalGeometry> QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom ) const
{ {
sfcgal::errorHandler()->clearText( &mLastError ); sfcgal::errorHandler()->clearText( &mLastError );
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), &mLastError ); sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), &mLastError );

6
src/core/geometry/qgssfcgalgeometry.h
View File

@ -485,27 +485,25 @@ class CORE_EXPORT QgsSfcgalGeometry
* Calculate the intersection of this and \a otherGeom. * Calculate the intersection of this and \a otherGeom.
* *
* \param otherGeom geometry to perform the operation * \param otherGeom geometry to perform the operation
* \param parameters can be used to specify parameters which control the intersection results
* \return new geometry * \return new geometry
* *
* If an error was encountered during the operation, more information can be retrieved * If an error was encountered during the operation, more information can be retrieved
* by calling lastError() on the returned geometry. * by calling lastError() on the returned geometry.
* *
*/ */
std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsAbstractGeometry *otherGeom ) const;
/** /**
* Calculate the intersection of this and \a otherGeom. * Calculate the intersection of this and \a otherGeom.
* *
* \param otherGeom geometry to perform the operation * \param otherGeom geometry to perform the operation
* \param parameters can be used to specify parameters which control the intersection results
* \return new geometry * \return new geometry
* *
* If an error was encountered during the operation, more information can be retrieved * If an error was encountered during the operation, more information can be retrieved
* by calling lastError() on the returned geometry. * by calling lastError() on the returned geometry.
* *
*/ */
std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> intersection( const QgsSfcgalGeometry &otherGeom ) const;
/** /**
* Calculate the combination of this and \a geomList. * Calculate the combination of this and \a geomList.