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

[Viewer] Fix of side effects from output sequence in SequencePlayer

Browse source 
Unsync 3D Viewer and SequencePlayer if it is output sequence and set to 0 the frame displayed when changing sequence
This commit is contained in:
Aurore LAFAURIE 2024-04-19 10:43:38 +02:00
parent b0063b0dde
commit 6e89cb68f6
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ FocusScope {
readonly property alias sync3DSelected: sequencePlayer.sync3DSelected
property var sequence: []
property int currentFrame: sequencePlayer.frameId
property alias currentFrame: sequencePlayer.frameId
QtObject {
id: m
@ -261,6 +261,7 @@ FocusScope {
let objs = []
if (displayedNode && displayedNode.hasSequenceOutput) {
currentFrame = 0
objs = Filepath.resolve(path_template, null)
//order by path
objs.sort()
@ -310,11 +311,7 @@ FocusScope {
// store attr name for output attributes that represent images
for (var i = 0; i < displayedNode.attributes.count; i++) {
var attr = displayedNode.attributes.at(i)
if (attr.isOutput && attr.desc.semantic === "image" && attr.enabled) {
names.push(attr.name)
}
if (attr.isOutput && attr.desc.semantic === "sequence" && attr.enabled) {
if (attr.isOutput && (attr.desc.semantic === "image" || attr.desc.semantic === "sequence") && attr.enabled) {
names.push(attr.name)
}
}
@ -324,7 +321,6 @@ FocusScope {
outputAttribute.names = names
if (displayedNode && !displayedNode.hasSequenceOutput) {
root.source = getImageFile()
} else {
root.sequence = getSequence()
@ -1359,6 +1355,7 @@ FocusScope {
onNameChanged: {
root.source = getImageFile()
root.sequence = getSequence()
}
}
@ -1462,6 +1459,7 @@ FocusScope {
viewer: floatImageViewerLoader.status === Loader.Ready ? floatImageViewerLoader.item : null
visible: root.enableSequencePlayer
enabled: root.enableSequencePlayer
isOutputSequence: root.displayedNode && root.displayedNode.hasSequenceOutput
}
}
}