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

Jump to bottom

Point cloud editing fixes #60237

Merged
merged 14 commits into from
Feb 3, 2025
Merged

Point cloud editing fixes #60237

merged 14 commits into from
Feb 3, 2025

Conversation

uclaros
Copy link
Contributor

@uclaros uclaros commented Jan 23, 2025

Description

This PR fixes point selection for the following cases:

  • Skips points outside the view frustum / behind the near plane
  • Skips points outside the 3d view's 2d clipping extent
  • Skips points with no classification category on the 3d renderer
  • Skips points filtered out by the layer's filter
  • Properly select points when layer has elevation properties scale and/or offset

@github-actions github-actions bot added this to the 3.42.0 milestone Jan 23, 2025
@uclaros uclaros force-pushed the point-cloud-editing-tidyup branch from 8b0cdfe to 395652a Compare January 23, 2025 10:47
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 23, 2025 •
edited
Loading

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit dd04c90)

🪟 Windows Qt6 builds

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

@uclaros uclaros added 3D Relates to QGIS' 3D engine or rendering Point Clouds labels Jan 23, 2025
wonder-sk
wonder-sk reviewed Jan 23, 2025
View reviewed changes
Copy link
Member

@wonder-sk wonder-sk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add auto test for the ignoreIndexFilter flag, and for change attribute value API when there's a subset string applied?

src/core/pointcloud/qgspointcloudeditingindex.cpp Outdated Show resolved Hide resolved
src/core/pointcloud/qgscopcpointcloudindex.cpp Show resolved Hide resolved
src/app/3d/qgs3dmaptoolpointcloudchangeattribute.cpp Show resolved Hide resolved
@nyalldawson
Copy link
Collaborator

This needs a rebase

uclaros added 14 commits February 3, 2025 09:54
@uclaros
Remove unused method
909751c
@uclaros
Check if point is within view frustum / not behind the near plane
c87485e
@uclaros
Check if point is within 3d map's clipping extent
d8b86c7
@uclaros
Check if points have a visible classified renderer category
b6a2a83
@uclaros
Check if points satisfy the point cloud layer's filter expression
8a74c92
@uclaros
Adjust point elevation using the layer's elevation properties scale a…
0db966f 
…nd offset
@uclaros
Make subsetString/setSubsetString virtual
105e6f4
@uclaros
Update ignoreIndexFilterEnabled docstrings and make sure it is respec…
336e892 
…ted in all api calls
@uclaros
Check bbox intersection before polygon intersection
2b47c49
@uclaros
Store filter expression as a QString in QgsPointCloudCacheKey
7d9426f
@uclaros
Add test for editing a filtered layer
409720f
@uclaros
Use prepared geometry for intersection checking
76db6ce
@uclaros
make clang-tidy happy
3ba84de
@uclaros
more clang
dd04c90
@uclaros uclaros force-pushed the point-cloud-editing-tidyup branch from e13628b to dd04c90 Compare February 3, 2025 07:56
@nyalldawson nyalldawson merged commit 64100e8 into qgis:master Feb 3, 2025
31 checks passed
@uclaros uclaros deleted the point-cloud-editing-tidyup branch February 4, 2025 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nyalldawson nyalldawson nyalldawson left review comments

@wonder-sk wonder-sk wonder-sk approved these changes

Assignees
No one assigned
Labels
3D Relates to QGIS' 3D engine or rendering Point Clouds
Projects
None yet
Milestone
3.42.0
Development

Successfully merging this pull request may close these issues.
3 participants
@uclaros @nyalldawson @wonder-sk