3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-03 00:38:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] always display at least "Image Gallery" in ComboBox

Browse source
This commit is contained in:
Loïc Vital 2022-10-07 16:33:02 +02:00 • committed by Fabien Castan
parent a5fbbe7d82
commit 18b5f4bb21
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,7 @@ FocusScope {
if (useExternal) {
return sourceExternal;
}
if (!displayedNode || outputAttribute.name == "" || outputAttribute.name == "gallery") {
if (!displayedNode || outputAttribute.name == "gallery") {
return getViewpointPath(_reconstruction.selectedViewId);
}
return getFileAttributePath(displayedNode, outputAttribute.name, _reconstruction.selectedViewId);
@ -264,11 +264,8 @@ FocusScope {
names.push(attr.name);
}
}
// ensure that we can always visualize the gallery
if (names.length > 0) {
names.push("gallery");
}
}
names.push("gallery");
outputAttribute.names = names;
}
@ -1108,10 +1105,10 @@ FocusScope {
Layout.minimumWidth: 0
flat: true
property var names: []
property string name: names[currentIndex] ? names[currentIndex] : ""
property var names: ["gallery"]
property string name: names[currentIndex]
model: displayedNode ? names.map(n => (n == "gallery") ? "Image Gallery" : displayedNode.attributes.get(n).label) : []
model: names.map(n => (n == "gallery") ? "Image Gallery" : displayedNode.attributes.get(n).label)
enabled: count > 0
FontMetrics {