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.

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

Correct filtering of Vector type vs VectorAnyGeometry in multiple source processing parameter #56453

Merged
merged 2 commits into from Feb 22, 2024

Conversation

Djedouas
Copy link
Member

Description

Fixes #55636

The layer filtering in the processing parameter "multiple source" for Vector and VectorAnyGeometry was the same.

Now it behaves as expected:

  • Vector is all vector layer (with geometry or not)
  • VectorAnyGeometry is vector layers with a geometry

…try in multiple source processing parameter
@github-actions github-actions bot added this to the 3.36.0 milestone Feb 21, 2024
Copy link

github-actions bot commented Feb 21, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 5188c10)

Copy link

github-actions bot commented Feb 21, 2024

Tests failed for Qt 6

One or more tests failed using the build from commit 5188c10

composermap_render (render)

composermap_render

Test failed at render at tests/src/core/testqgslayoutmap.cpp:185

Rendered image did not match tests/testdata/control_images/composer_map/expected_composermap_render/expected_composermap_render.png (found 13824 pixels different)

composermap_overview_center (overviewMapCenter)

composermap_overview_center

Test failed at overviewMapCenter at tests/src/core/testqgslayoutmapoverview.cpp:224

Rendered image did not match tests/testdata/control_images/composer_mapoverview/expected_composermap_overview_center/expected_composermap_overview_center.png (found 116 pixels different)

flat_terrain_2 (testFlatTerrain)

flat_terrain_2

Test failed at testFlatTerrain at tests/src/3d/testqgs3drendering.cpp:316

Rendered image did not match tests/testdata/control_images/3d/expected_flat_terrain_2/expected_flat_terrain_2.png (found 2725 pixels different)

dem_terrain_1 (testDemTerrain)

dem_terrain_1

Test failed at testDemTerrain at tests/src/3d/testqgs3drendering.cpp:363

Rendered image did not match tests/testdata/control_images/3d/expected_dem_terrain_1/expected_dem_terrain_1.png (found 1603 pixels different)

4978_line_rendering_2 (testEpsg4978LineRendering)

4978_line_rendering_2

Test failed at testEpsg4978LineRendering at tests/src/3d/testqgs3drendering.cpp:1293

Rendered image did not match tests/testdata/control_images/3d/expected_4978_line_rendering_2/expected_4978_line_rendering_2.png (found 128045 pixels different)

phong_shading (testPhongShading)

phong_shading

Test failed at testPhongShading at tests/src/3d/testqgs3drendering.cpp:503

Rendered image did not match tests/testdata/control_images/3d/expected_phong_shading/expected_phong_shading.png (found 51 pixels different)

metal_rough (testExtrudedPolygonsMetalRoughShading)

metal_rough

Test failed at testExtrudedPolygonsMetalRoughShading at tests/src/3d/testqgs3drendering.cpp:649

Rendered image did not match tests/testdata/control_images/3d/expected_metal_rough/expected_metal_rough.png (found 54 pixels different)

line_rendering_2 (testLineRendering)

line_rendering_2

Test failed at testLineRendering at tests/src/3d/testqgs3drendering.cpp:761

dem_terrain_filtered_1 (testFilteredDemTerrain)

dem_terrain_filtered_1

Test failed at testFilteredDemTerrain at tests/src/3d/testqgs3drendering.cpp:1370

Rendered image did not match tests/testdata/control_images/3d/expected_dem_terrain_filtered_1/expected_dem_terrain_filtered_1.png (found 3886 pixels different)

composermap_overview_center

composermap_overview_center

Test failed at testOverviewMapCenter at tests/src/python/test_qgslayoutmapoverview.py:161

Rendered image did not match tests/testdata/control_images/composer_mapoverview/expected_composermap_overview_center/expected_composermap_overview_center.png (found 116 pixels different)

composermap_overview_belowmap

composermap_overview_belowmap

Test failed at testOverviewStacking at tests/src/python/test_qgslayoutmapoverview.py:333

Rendered image did not match tests/testdata/control_images/composer_mapoverview/expected_composermap_overview_belowmap/expected_composermap_overview_belowmap.png (found 580 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.

@Djedouas
Copy link
Member Author

Tests failing are unrelated to this PR

src/core/qgsmbtiles.cpp:41 : (open) [0ms] Can't open MBTiles database: out of memory

@nyalldawson
Copy link
Collaborator

Could you add a unit test covering this? There's quite extensive tests in TestProcessingGui::testMultipleFileSelectionDialog which can be extended to cover this scenario.

@Djedouas
Copy link
Member Author

Could you add a unit test covering this? There's quite extensive tests in TestProcessingGui::testMultipleFileSelectionDialog which can be extended to cover this scenario.

@nyalldawson Thanks for pointing me the location, I didn't find it at first 👍🏼

Test added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using TypeVectorAnyGeometry in multiple input parameter not filtering non-spatial layers
2 participants