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

[ui][Viewer3D] fix cache update and reparenting issues

Browse source 
* don't try to put object in cache on MediaLoader 'Component.onCompleted' callback ; only effect was to put back in cache a media retrieved from cache during 'onFinalSourceChanged'
* redesign 'updateModelAndCache' as 'updateModel' and 'updateCacheAndModel' for this purpose
* wait for MediaLoader full initialization (@ 'NodeInstiator.onObjectAdded' callback) to reparent an object retrieved from cache; otherwise it silently fails.
This commit is contained in:
Yann Lanthony 2019-01-31 16:07:33 +01:00
parent 10c3454bad
commit 6a297d5bff
1 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
meshroom/ui/qml/Viewer3D/MediaLibrary.qml
View file

@ -146,6 +146,9 @@ Entity {
delegate: MediaLoader {
id: mediaLoader
// whether MediaLoader has been fully instantiated by the NodeInstantiator
property bool fullyInstantiated: false
// explicitely store some attached model properties for outside use and ease binding
readonly property var attribute: model.attribute
readonly property int idx: index
@ -192,13 +195,17 @@ Entity {
model.requested = false;
}
function updateModelAndCache(forceRequest) {
function updateCacheAndModel(forceRequest) {
// don't cache explicitely unloaded media
if(model.requested && object && dependencyReady) {
// cache current object
if(cache.add(Filepath.urlToString(mediaLoader.source), object));
object = null;
}
updateModel(forceRequest);
}
function updateModel(forceRequest) {
// update model's source path if input is an attribute
if(attribute) {
model.source = rawSource;
@ -212,13 +219,15 @@ Entity {
// keep 'source' -> 'entity' reference
m.sourceToEntity[modelSource] = mediaLoader;
// always request media loading when delegate has been created
updateModelAndCache(true);
updateModel(true);
// if external media failed to open, remove element from model
if(!attribute && !object)
remove(index)
}
onCurrentSourceChanged: updateModelAndCache(false)
onCurrentSourceChanged: {
updateCacheAndModel(false)
}
onFinalSourceChanged: {
// update media visibility
@ -229,7 +238,12 @@ Entity {
cached = cachedObject !== undefined;
if(cached) {
object = cachedObject;
object.parent = mediaLoader;
// only change cached object parent if mediaLoader has been fully instantiated
// by the NodeInstantiator; otherwise re-parenting will fail silently and the object will disappear...
// see "onFullyInstantiatedChanged" and parent NodeInstantiator's "onObjectAdded"
if(fullyInstantiated) {
object.parent = mediaLoader;
}
}
mediaLoader.source = Filepath.stringToUrl(finalSource);
if(object) {
@ -246,6 +260,12 @@ Entity {
}
}
onFullyInstantiatedChanged: {
// delayed reparenting of object coming from the cache
if(object)
object.parent = mediaLoader;
}
onStatusChanged: {
model.status = status
// remove model entry for external media that failed to load
@ -261,6 +281,12 @@ Entity {
}
]
}
onObjectAdded: {
// notify object that it is now fully instantiated
object.fullyInstantiated = true;
}
onObjectRemoved: {
delete m.sourceToEntity[object.modelSource];
}