3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-19 01:27:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] minor code cleanup

Browse source
This commit is contained in:
Loïc Vital 2022-09-23 17:48:37 +02:00 • committed by Fabien Castan
parent f90942bd2d
commit 9de858efe4
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
meshroom/ui/qml/Viewer/Viewer2D.qml
View file

@ -155,6 +155,11 @@ FocusScope {
}
function tryLoadNode(node) {
// safety check
if (!node) {
return;
}
// node must be computed or at least running
if (!node.isFinishedOrRunning()) {
return;
@ -179,7 +184,7 @@ FocusScope {
function getImageFile() {
// entry point for getting the image file URL that corresponds to
// the displayed node, selected output attribute and selected viewId
if (outputAttribute.name == "" || outputAttribute.name == "gallery") {
if (!displayedNode || outputAttribute.name == "" || outputAttribute.name == "gallery") {
return getViewpointPath(_reconstruction.selectedViewId);
}
return getFileAttributePath(displayedNode, outputAttribute.name, _reconstruction.selectedViewId);
@ -222,6 +227,11 @@ FocusScope {
}
onDisplayedNodeChanged: {
// safety check
if (!displayedNode) {
return;
}
var names = [];
// store attr name for output attributes that represent images
for (var i = 0; i < displayedNode.attributes.count; i++) {
@ -230,10 +240,12 @@ FocusScope {
names.push(attr.name);
}
}
// ensure that we can always visualize the gallery
if (names.length > 0) {
names.push("gallery");
}
outputAttribute.names = names;
}
@ -1078,7 +1090,7 @@ FocusScope {
flat: true
property var names: []
property string name: (names.length > 0) ? (enabled ? names[currentIndex] : names[0]) : ""
property string name: ""
model: names
enabled: activeNode
@ -1088,12 +1100,18 @@ FocusScope {
}
onNamesChanged: {
// set size to max name length
// update name (requires some safety check)
if (names.length > 0 && names[0]) {
name = names[0];
} else {
name = "";
}
// update width (set size to max name length + add margin for the dropdown icon)
var maxWidth = 0;
for (var i = 0; i < names.length; i++) {
maxWidth = Math.max(maxWidth, fontMetrics.boundingRect(names[i]).width);
}
// add margin for the dropdown icon
Layout.preferredWidth = maxWidth + 3.0 * Qt.application.font.pixelSize;
}
}