Feature/add nurbscurve core part #64521

lbartoletti · 2026-01-12T20:07:20Z

Description

This PR is the extraction of the CORE part of the free-forms/NURBS functionality. I have made clean commits again, incorporating comments from @nyalldawson and @rouault . I hope I haven't made any mistakes in my multiple rebases/conflicts...

The other parts will be opened after.

Thank you again for your reviews and positive comments on the previous PR 🙏 💗 .

I am leaving #64358 open for overview and documentation purposes.

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 141805e)

🍎 MacOS Qt6 builds

Download MacOS Qt6 builds of this PR for testing.
This installer is not signed, control+click > open the app to avoid the warning
(Built from commit 141805e)

github-actions · 2026-01-13T15:47:41Z

Tests failed for Qt 6 (ALL_BUT_PROVIDERS - fedora)

One or more tests failed using the build from commit 95e2aeb

layout_export

Test failed at test_layout_export at tests/src/python/test_selective_masking.py:1161

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export/layout_export.png (found 8 pixels different)

layout_export_2_sources_masking

Test failed at test_layout_export_2_sources_masking at tests/src/python/test_selective_masking.py:1533

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_2_sources_masking/layout_export_2_sources_masking.png (found 6 pixels different)

layout_export_w_blend_mode

Test failed at test_layout_export_w_label_blend_mode at tests/src/python/test_selective_masking.py:1236

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_w_blend_mode/layout_export_w_blend_mode.png (found 287 pixels different)

layout_export_w_raster

Test failed at test_layout_export_w_raster at tests/src/python/test_selective_masking.py:1327

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_w_raster/layout_export_w_raster.png (found 6 pixels different)

layout_export_markerline_masked

Test failed at test_markerline_masked at tests/src/python/test_selective_masking.py:1817

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_markerline_masked/layout_export_markerline_masked.png (found 8 pixels different)

The full test report (included comparison of rendered vs expected images) can be found here.

Further documentation on the QGIS test infrastructure can be found in the Developer's Guide.

github-actions · 2026-01-13T15:47:43Z

Tests failed for Qt 6 (ALL_BUT_PROVIDERS - ubuntu)

One or more tests failed using the build from commit 95e2aeb

layout_export

Test failed at test_layout_export at tests/src/python/test_selective_masking.py:1161

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export/layout_export.png (found 8 pixels different)

layout_export_2_sources_masking

Test failed at test_layout_export_2_sources_masking at tests/src/python/test_selective_masking.py:1533

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_2_sources_masking/layout_export_2_sources_masking.png (found 6 pixels different)

layout_export_w_blend_mode

Test failed at test_layout_export_w_label_blend_mode at tests/src/python/test_selective_masking.py:1236

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_w_blend_mode/layout_export_w_blend_mode.png (found 287 pixels different)

layout_export_w_raster

Test failed at test_layout_export_w_raster at tests/src/python/test_selective_masking.py:1327

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_w_raster/layout_export_w_raster.png (found 6 pixels different)

layout_export_markerline_masked

Test failed at test_markerline_masked at tests/src/python/test_selective_masking.py:1817

Rendered image did not match tests/testdata/control_images/selective_masking/layout_export_markerline_masked/layout_export_markerline_masked.png (found 8 pixels different)

The full test report (included comparison of rendered vs expected images) can be found here.

Further documentation on the QGIS test infrastructure can be found in the Developer's Guide.

src/core/geometry/qgslinestring.cpp

nyalldawson · 2026-01-14T05:49:57Z

LGTM -- except for one last comment, and the selective masking control image changes. Can you replace with the images with test mask updates instead?

uclaros · 2026-01-14T13:53:32Z

It seems to me that the changes in

qgis.h
qgspointlocator.h
qgspointlocator.cpp
qgssnappingconfig.cpp
qgssnappingutils.cpp
qgssettingsregistrycore.h
qgssettingsregistrycore.cpp

should go in a follow up PR related to digitizing, also subject to discussion on the promised upcoming QEP.

It would also be helpful for fellow reviewers if you refrained from force pushing during the review process.

lbartoletti · 2026-01-14T14:21:36Z

LGTM -- except for one last comment, and the selective masking control image changes. Can you replace with the images with test mask updates instead?

I did it, I think, it's ok with my last commits.

lbartoletti · 2026-01-14T14:21:54Z

Many thanks to both of you @nyalldawson @rouault, for your careful review.

I’m sorry I missed some of your remarks and for the mess I created while juggling merges and conflicts.

nyalldawson · 2026-01-14T20:18:01Z

@lbartoletti

I did it, I think, it's ok with my last commits.

Was this commit pushed? I still see the replacement control images, not masks.

Otherwise it's a +1 to merge from me. Lovely work here, adding a new geometry class like this is very tricky 💯

nyalldawson · 2026-01-15T06:27:50Z

@lbartoletti looks like the control image changes are still here -- can you revert those and leave JUST the mask updates?

…cBezier

co-authored: Nyall Dawson <[email protected]>

…t version

…ation

…interpolatePointOnCubicBezier The previous algorithm accumulated error with += and -=, new algorithm is more robust and numercially stable

…GeometryUtilsBase and use it

Add missing mask files

nyalldawson · 2026-01-15T06:45:36Z

Thanks @lbartoletti -- nothing else from me!

lbartoletti · 2026-01-15T06:46:36Z

@lbartoletti

I did it, I think, it's ok with my last commits.

Was this commit pushed? I still see the replacement control images, not masks.

@lbartoletti looks like the control image changes are still here -- can you revert those and leave JUST the mask updates?

Ah, indeed! it's fixup. Thanks!

Otherwise it's a +1 to merge from me. Lovely work here, adding a new geometry class like this is very tricky 💯

Many thanks 😊

And thanks again for your review with even!

uclaros · 2026-01-15T07:03:38Z

It seems to me that the changes in
qgis.h
qgspointlocator.h
qgspointlocator.cpp
qgssnappingconfig.cpp
qgssnappingutils.cpp
qgssettingsregistrycore.h
qgssettingsregistrycore.cpp
should go in a follow up PR related to digitizing, also subject to discussion on the promised upcoming QEP.

Can I please have a comment regarding this?

lbartoletti · 2026-01-15T11:19:18Z

It seems to me that the changes in
qgis.h
qgspointlocator.h
qgspointlocator.cpp
qgssnappingconfig.cpp
qgssnappingutils.cpp
qgssettingsregistrycore.h
qgssettingsregistrycore.cpp
should go in a follow up PR related to digitizing, also subject to discussion on the promised upcoming QEP.
Can I please have a comment regarding this?

Sure!
Just to clarify the scope: I committed to separating the core from the GUI. This PR covers the core part.

Unfortunately, some parts are "intertwined". But after looking at the commits, I can remove these two,
cb584ff and b03f273, and remove enum class NurbsMode and CaptureTechnique::NurbsCurve from qgis.h.
This will change other parts as well.
I let nyall ask me what to do since he have made a constructive review and already have validated the PR

uclaros · 2026-01-16T08:26:27Z

Unfortunately, some parts are "intertwined". But after looking at the commits, I can remove these two,
cb584ff and b03f273, and remove enum class NurbsMode and CaptureTechnique::NurbsCurve from qgis.h.

I'm sorry I was not clear regarding qgis.h, obviously the changes to Qgis::WkbType are absolutely required. To clarify, let's limit this to enum class NurbsMode, CaptureTechnique::NurbsCurve and SnappingType::ControlPoint and their usages. I don't think the changes to the rest of the files mentioned are "intertwined" with other parts and could be removed.
It would be great if you could handle this!

This reverts commit cb584ff.

This reverts commit b03f273.

…ve and SnappingType::ControlPoint

lbartoletti · 2026-01-18T09:49:10Z

ok, done

lbartoletti requested review from 3nids, m-kuhn, nyalldawson and rouault January 12, 2026 20:07

github-actions bot added this to the 4.0.0 milestone Jan 12, 2026

rouault reviewed Jan 12, 2026

View reviewed changes

src/core/geometry/qgsnurbscurve.cpp Outdated Show resolved Hide resolved

src/core/geometry/qgsnurbscurve.cpp Show resolved Hide resolved

nyalldawson reviewed Jan 12, 2026

View reviewed changes

lbartoletti force-pushed the feature/add_nurbscurve_core_part branch from 0113519 to 95e2aeb Compare January 13, 2026 13:03

lbartoletti force-pushed the feature/add_nurbscurve_core_part branch 4 times, most recently from 269b5fa to 6fea194 Compare January 13, 2026 17:15

nyalldawson reviewed Jan 14, 2026

View reviewed changes

src/core/geometry/qgslinestring.cpp Outdated Show resolved Hide resolved

lbartoletti force-pushed the feature/add_nurbscurve_core_part branch from 6fea194 to 48c735d Compare January 14, 2026 10:43

lbartoletti added 5 commits January 15, 2026 07:29

feat(core): add QgsNurbsCurve class for NURBS curve support

58bc22e

test(core): add C++ unit tests for QgsNurbsCurve

8748ac1

test(core): add Python tests for QgsNurbsCurve

febe82c

feat(geometry): add interpolatePointOnCubicBezier

3e7395c

refactor(qgslinestring): use QgsGeometryUtils::interpolatePointOnCubi…

0a85903

…cBezier

lbartoletti added 16 commits January 15, 2026 07:29

chore(style): fixup revert code formatting + SIP

9331405

docs(geometryutils): move cubic bézier formula inside a code bloc

db5565b

co-authored: Nyall Dawson <[email protected]>

refactor(nurbs): replace const QVector<QgsPoint> & by QVector<QgsPoint>

dae39d1

refactor(nurbs): rename findNurbsCurveForVertex and SIP_SKIP the cons…

5f2c524

…t version

fix(nurbs): enforce wkb endianess

c5c46c0

fix(geometryutils): derive wkbType from all points in Bézier interpol…

e2e600e

…ation

test(core): complete test(core): add Python tests for QgsNurbsCurve

5fe5990

fix(qgsgeometry): fix roundwaves test after use of QgsGeometryUtils::…

45dff76

…interpolatePointOnCubicBezier The previous algorithm accumulated error with += and -=, new algorithm is more robust and numercially stable

chore(spell): add spellok for 'normalY'

bb0a27f

fix(qgsgeometrypaintdevice): fix tests

9fd1b35

refactor(qgsgeoemtryutils): move interpolatePointOnCubicBezier to Qgs…

9599a26

…GeometryUtilsBase and use it

perf(qgslinestring): rewrite fromBezierCurve using QgsGeometryUtilsBase

a2002f4

test(qgsgeometryutils): add tests for interpolatePointOnCubicBezier

e4d4820

chore(nurbs): add a TODO for sumUpArea

c7a48bb

temporary commit, placeholder for nurbs app/gui part

cb584ff

fixup! fix(selectivemasking): fix due to numericalstability

6d70287

Add missing mask files

lbartoletti force-pushed the feature/add_nurbscurve_core_part branch from 9cbaa81 to 6d70287 Compare January 15, 2026 06:43

nyalldawson approved these changes Jan 15, 2026

View reviewed changes

rouault approved these changes Jan 16, 2026

View reviewed changes

lbartoletti added 3 commits January 18, 2026 07:26

Revert "temporary commit, placeholder for nurbs app/gui part"

1662a63

This reverts commit cb584ff.

Revert "feat(core): add ControlPoint snapping support"

ad05a7a

This reverts commit b03f273.

revert(core): remove enum class NurbsMode, CaptureTechnique::NurbsCur…

141805e

…ve and SnappingType::ControlPoint

lbartoletti self-assigned this Jan 19, 2026

lbartoletti merged commit e905ef7 into qgis:master Jan 20, 2026
28 checks passed

Uh oh!

Feature/add nurbscurve core part #64521

Feature/add nurbscurve core part #64521

Uh oh!

Conversation

lbartoletti commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

Uh oh!

Uh oh!

nyalldawson commented Jan 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nyalldawson commented Jan 12, 2026

Uh oh!

github-actions bot commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🪟 Windows Qt6 builds

🍎 MacOS Qt6 builds

Uh oh!

github-actions bot commented Jan 13, 2026

Tests failed for Qt 6 (ALL_BUT_PROVIDERS - fedora)

layout_export

layout_export

layout_export_2_sources_masking

layout_export_2_sources_masking

layout_export_w_blend_mode

layout_export_w_blend_mode

layout_export_w_raster

layout_export_w_raster

layout_export_markerline_masked

layout_export_markerline_masked

Uh oh!

github-actions bot commented Jan 13, 2026

Tests failed for Qt 6 (ALL_BUT_PROVIDERS - ubuntu)

layout_export

layout_export

layout_export_2_sources_masking

layout_export_2_sources_masking

layout_export_w_blend_mode

layout_export_w_blend_mode

layout_export_w_raster

layout_export_w_raster

layout_export_markerline_masked

layout_export_markerline_masked

Uh oh!

Uh oh!

nyalldawson commented Jan 14, 2026

Uh oh!

uclaros commented Jan 14, 2026

Uh oh!

lbartoletti commented Jan 14, 2026

Uh oh!

lbartoletti commented Jan 14, 2026

Uh oh!

nyalldawson commented Jan 14, 2026

Uh oh!

nyalldawson commented Jan 15, 2026

Uh oh!

nyalldawson commented Jan 15, 2026

Uh oh!

lbartoletti commented Jan 15, 2026

Uh oh!

uclaros commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lbartoletti commented Jan 15, 2026

Uh oh!

uclaros commented Jan 16, 2026

Uh oh!

lbartoletti commented Jan 12, 2026 •

edited

Loading

github-actions bot commented Jan 12, 2026 •

edited

Loading

uclaros commented Jan 15, 2026 •

edited

Loading