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

[Viewer] SequencePlayer: Fix QML errors when accessing undefined objects

Browse source
This commit is contained in:
Candice Bentéjac 2024-06-27 17:22:02 +02:00
parent ccf76ab3b5
commit 0e06ae8747
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ FloatingPane {
Settings {
id: settings_SequencePlayer
property int maxCacheMemory: viewer ? viewer.ramInfo.x/4 : 0
property int maxCacheMemory: viewer && viewer.ramInfo != undefined ? viewer.ramInfo.x / 4 : 0
}
function updateReconstructionView() {
@ -441,7 +441,11 @@ FloatingPane {
Text {
height: sync3DCheckBox.height
verticalAlignment: Text.AlignVCenter
text: "Available Memory: " + viewer.ramInfo.x + " GB"
text: {
if (viewer && viewer.ramInfo != undefined)
return "Available Memory: " + viewer.ramInfo.x + " GB"
return "Unknown Available Memory"
}
color: palette.text
}
@ -467,11 +471,17 @@ FloatingPane {
width: parent.width
from: 0
to: viewer ? viewer.ramInfo.x : 0
to: viewer && viewer.ramInfo != undefined ? viewer.ramInfo.x : 0
value: viewer ? settings_SequencePlayer.maxCacheMemory : 0
ToolTip.text: "Max cache memory set: " + settings_SequencePlayer.maxCacheMemory + " GB" + "\n" + "on available memory: "+ viewer.ramInfo.x + " GB"
ToolTip.text: {
let ramMsg = "Max cache memory set: " + settings_SequencePlayer.maxCacheMemory + " GB"
if (viewer && viewer.ramInfo != undefined) {
return ramMsg + "\n" + "on available memory: " + viewer.ramInfo.x + " GB"
}
return ramMsg + ",\n" + "available memory unknown"
}
ToolTip.visible: hovered
ToolTip.delay: 100
}
@ -483,9 +493,14 @@ FloatingPane {
from: 0
to: settings_SequencePlayer.maxCacheMemory
value: viewer.ramInfo.y
value: viewer && viewer.ramInfo != undefined ? viewer.ramInfo.y : 0
ToolTip.text: "Occupied cache: "+ viewer.ramInfo.y + " GB" + "\n" +"On max cache memory set: " + settings_SequencePlayer.maxCacheMemory + " GB"
ToolTip.text: {
if (viewer && viewer.ramInfo != undefined) {
return "Occupied cache: "+ viewer.ramInfo.y + " GB" + "\n" + "On max cache memory set: " + settings_SequencePlayer.maxCacheMemory + " GB"
}
return "Unknown occupied cache (max cache memory set: " + settings_SequencePlayer.maxCacheMemory + ")"
}
ToolTip.visible: hovered
ToolTip.delay: 100
}