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

[ui] Use of pyseq for getting sequences

Browse source 
[ui] To squash
This commit is contained in:
Aurore LAFAURIE 2024-05-24 14:36:45 +02:00
parent 1168ccaacb
commit cc2099534b
4 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshroom/ui/qml/Viewer/SequencePlayer.qml
View file

@ -39,7 +39,7 @@ FloatingPane {
function updateReconstructionView() {
if (isOutputSequence)
return
if (_reconstruction && m.frame >= 0 && m.frame < sortedViewIds.length) {
if (_reconstruction && m.frame >= frameRange.min && m.frame < frameRange.max+1) {
if (!m.playing && !frameSlider.pressed) {
_reconstruction.selectedViewId = sortedViewIds[m.frame];
} else {

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

@ -268,20 +268,26 @@ FocusScope {
let ids = sequence[0]
let resolved = sequence[1]
//order by path
resolved.sort()
// reset current frame to 0 if it is imageList but not sequence
if (attr.desc.semantic === "imageList") {
// concat in one array all sequences in resolved
resolved = [].concat.apply([], resolved)
frameRange.min = 0
frameRange.max = resolved.length-1
currentFrame = 0
}
if (attr.desc.semantic === "sequence") {
// if there is several sequences, take the first one
resolved = resolved[0]
ids = ids[0]
frameRange.min = ids[0]
frameRange.max = ids[ids.length-1]
currentFrame = frameRange.min
}
//order by path
resolved.sort()
return resolved
} else {
for (let i = 0; i < _reconstruction.viewpoints.count; i++) {