Skip to content

Fix Qt6-induced issues #2620

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

Merged
merged 3 commits into from
Dec 18, 2024
Merged

Fix Qt6-induced issues #2620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9aa9e7f
[GraphEditor] Add missing import of `Utils` to access `Format` methods
cbentejac Dec 17, 2024
e3f1e27
[Viewer3D] MediaLoader: Bind `fixedPointSize` for the SfMLoader
cbentejac Dec 17, 2024
ebbd000
[Viewer3D] MediaLoader: Send `pointSize` as is
cbentejac Dec 17, 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: 1 addition & 0 deletions meshroom/ui/qml/GraphEditor/NodeStatistics.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import QtQuick.Controls
import QtQuick.Layouts

import Controls 1.0
import Utils 1.0

/**
* NodeStatistics displays statistics data of Node's chunks (NodeChunks).
Expand Down
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 @@ -108,7 +108,8 @@ import Utils 1.0
Component.onCompleted: {
var obj = Viewer3DSettings.sfmDataLoaderComp.createObject(sfmDataLoaderEntity, {
"source": source,
"pointSize": Qt.binding(function() { return 0.01 * Viewer3DSettings.pointSize }),
"fixedPointSize": Qt.binding(function() { return Viewer3DSettings.fixedPointSize }),
"pointSize": Qt.binding(function() { return Viewer3DSettings.pointSize }),
"locatorScale": Qt.binding(function() { return Viewer3DSettings.cameraScale }),
"cameraPickingEnabled": Qt.binding(function() { return root.enabled && root.cameraPickingEnabled }),
"resectionId": Qt.binding(function() { return Viewer3DSettings.resectionId }),
Expand Down
Loading