Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-3_40] Fix test on newer geos, crash on qt 6 builds #59861

Merged
merged 5 commits into from
Dec 13, 2024
Merged

[Backport release-3_40] Fix test on newer geos, crash on qt 6 builds #59861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b95d5f
Fix test on newer geos
nyalldawson Dec 12, 2024
07c7594
Add missing transfer annotations
nyalldawson Dec 12, 2024
8540024
fixup
nyalldawson Dec 12, 2024
cdaf2d5
Fix leak, crash on Qt 6 builds
nyalldawson Dec 12, 2024
a0e1a0d
Run test on qt 6 builds
nyalldawson Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ci/test_blocklist_qt6.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ PyQgsShapefileProvider
PyQgsSpatialiteProvider
PyQgsSymbolLayerReadSld
PyQgsVectorLayerEditBuffer
PyQgsVectorLayerEditUtils
PyQgsLayerDefinition
PyQgsSettings
PyQgsSettingsEntry
Expand Down
4 changes: 2 additions & 2 deletions python/PyQt6/core/auto_generated/vector/qgsvectorlayereditutils.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Adds a ring to polygon/multipolygon features
.. versionadded:: 3.28
%End

Qgis::GeometryOperationResult addRing( QgsCurve *ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 ) /PyName=addCurvedRing/;
Qgis::GeometryOperationResult addRing( QgsCurve *ring /Transfer/, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 ) /PyName=addCurvedRing/;
%Docstring
Adds a ring to polygon/multipolygon features

Expand Down Expand Up @@ -151,7 +151,7 @@ Adds a new part polygon to a multipart feature
available in python bindings as addPartV2
%End

Qgis::GeometryOperationResult addPart( QgsCurve *ring, QgsFeatureId featureId ) /PyName=addCurvedPart/;
Qgis::GeometryOperationResult addPart( QgsCurve *ring /Transfer/, QgsFeatureId featureId ) /PyName=addCurvedPart/;
%Docstring
Adds a new part polygon to a multipart feature

Expand Down
4 changes: 2 additions & 2 deletions python/core/auto_generated/vector/qgsvectorlayereditutils.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Adds a ring to polygon/multipolygon features
.. versionadded:: 3.28
%End

Qgis::GeometryOperationResult addRing( QgsCurve *ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 ) /PyName=addCurvedRing/;
Qgis::GeometryOperationResult addRing( QgsCurve *ring /Transfer/, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 ) /PyName=addCurvedRing/;
%Docstring
Adds a ring to polygon/multipolygon features

Expand Down Expand Up @@ -151,7 +151,7 @@ Adds a new part polygon to a multipart feature
available in python bindings as addPartV2
%End

Qgis::GeometryOperationResult addPart( QgsCurve *ring, QgsFeatureId featureId ) /PyName=addCurvedPart/;
Qgis::GeometryOperationResult addPart( QgsCurve *ring /Transfer/, QgsFeatureId featureId ) /PyName=addCurvedPart/;
%Docstring
Adds a new part polygon to a multipart feature

Expand Down
7 changes: 4 additions & 3 deletions src/core/vector/qgsvectorlayereditutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,10 @@ Qgis::GeometryOperationResult QgsVectorLayerEditUtils::addRing( QgsCurve *ring,
std::unique_ptr<QgsCurve> uniquePtrRing( ring );
if ( modifiedFeatureId )
{
QgsFeatureIds *modifiedFeatureIds = new QgsFeatureIds;
Qgis::GeometryOperationResult result = staticAddRing( mLayer, uniquePtrRing, targetFeatureIds, modifiedFeatureIds, true );
*modifiedFeatureId = *modifiedFeatureIds->begin();
QgsFeatureIds modifiedFeatureIds;
Qgis::GeometryOperationResult result = staticAddRing( mLayer, uniquePtrRing, targetFeatureIds, &modifiedFeatureIds, true );
if ( modifiedFeatureId && !modifiedFeatureIds.empty() )
*modifiedFeatureId = *modifiedFeatureIds.begin();
return result;
}
return staticAddRing( mLayer, uniquePtrRing, targetFeatureIds, nullptr, true );
Expand Down
4 changes: 2 additions & 2 deletions src/core/vector/qgsvectorlayereditutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
* \return OperationResult result code: success or reason of failure
* \note available in python bindings as addCurvedRing
*/
Qgis::GeometryOperationResult addRing( QgsCurve *ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = nullptr ) SIP_PYNAME( addCurvedRing );
Qgis::GeometryOperationResult addRing( QgsCurve *ring SIP_TRANSFER, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = nullptr ) SIP_PYNAME( addCurvedRing );

/**
* Adds a new part polygon to a multipart feature
Expand Down Expand Up @@ -152,7 +152,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
*
* \note available in python bindings as addCurvedPart
*/
Qgis::GeometryOperationResult addPart( QgsCurve *ring, QgsFeatureId featureId ) SIP_PYNAME( addCurvedPart );
Qgis::GeometryOperationResult addPart( QgsCurve *ring SIP_TRANSFER, QgsFeatureId featureId ) SIP_PYNAME( addCurvedPart );

/**
* Translates feature by dx, dy
Expand Down
18 changes: 14 additions & 4 deletions tests/src/python/test_qgsvectorlayereditutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,14 +798,24 @@ def test_split_policy_polygon(self):
split_curve = QgsGeometry.fromWkt("LineString (-2.7 4.3, 5.5 11.8, 5.28 -5.57)")
temp_layer.splitFeatures(split_curve.constGet(), preserveCircular=False)

def round_attributes(_attributes, places):
res = []
for a in _attributes:
if isinstance(a, float):
res.append(round(a, places))
else:
res.append(a)

return res

features = list(temp_layer.getFeatures())
attributes = [f.attributes() for f in features]
attributes = [round_attributes(f.attributes(), 4) for f in features]
self.assertCountEqual(
attributes,
[
[None, 3301.0, 302.0, 303.0, 147.23845863746018],
[None, 301, 302.0, QgsUnsetAttributeValue(), 17.343326048780483],
[None, 301, 302.0, QgsUnsetAttributeValue(), 139.41821531375936],
[None, 3301.0, 302.0, 303.0, 147.2385],
[None, 301, 302.0, QgsUnsetAttributeValue(), 17.3433],
[None, 301, 302.0, QgsUnsetAttributeValue(), 139.4182],
],
)

Expand Down
Loading