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

[Viewer3D] Bind the display status of the resection groups to QtAliceVision #2257

Merged
merged 2 commits into from
Nov 21, 2023
Merged

[Viewer3D] Bind the display status of the resection groups to QtAliceVision #2257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0ebf14
[Viewer3D] MediaLoader: Bind the display status of the resection ID s…
cbentejac Nov 21, 2023
7d0ff8c
[Viewer3D] SfmDataLoader: Add comment to explain magic number
cbentejac Nov 21, 2023
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
3 changes: 2 additions & 1 deletion meshroom/ui/qml/Viewer3D/MediaLoader.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ import Utils 1.0
'pointSize': Qt.binding(function() { return 0.01 * Viewer3DSettings.pointSize }),
'locatorScale': Qt.binding(function() { return Viewer3DSettings.cameraScale }),
'cameraPickingEnabled': Qt.binding(function() { return root.enabled }),
'resectionId': Qt.binding(function() { return Viewer3DSettings.resectionId })
'resectionId': Qt.binding(function() { return Viewer3DSettings.resectionId }),
'displayResections': Qt.binding(function() { return Viewer3DSettings.displayResectionIds })
});

obj.statusChanged.connect(function() {
Expand Down
2 changes: 2 additions & 0 deletions meshroom/ui/qml/Viewer3D/SfmDataLoader.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ SfmDataEntity {
for (var i = 0; i < root.cameras.length; i++) {
var cam = root.cameras[i]
var resectionId = cam.resectionId
// 4294967295 = UINT_MAX, which might occur if the value is undefined on the C++ side
if (resectionId === undefined || resectionId === 4294967295)
continue
if (resectionId > maxResectionId)
Expand All @@ -60,6 +61,7 @@ SfmDataEntity {
for (var i = 0; i < root.cameras.length; i++) {
var cam = root.cameras[i]
var resectionId = cam.resectionId
// 4294967295 = UINT_MAX, which might occur if the value is undefined on the C++ side
if (resectionId === undefined || resectionId === 4294967295)
continue
arr[resectionId] = arr[resectionId] + 1
Expand Down