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

[Viewer] Prevent accessing null objects

Browse source
This commit is contained in:
Candice Bentéjac 2023-01-26 18:44:58 +01:00
parent 4eac23a52d
commit 422d9da48c
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meshroom/ui/qml/Viewer/FeaturesInfoOverlay.qml
View file

@ -100,7 +100,7 @@ FloatingPane {
ToolTip.visible: hovered ToolTip.visible: hovered
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
checked: root.featuresViewer.trackContiguousFilter checked: root.featuresViewer ? root.featuresViewer.trackContiguousFilter : false
onClicked: root.featuresViewer.trackContiguousFilter = trackContiguousFilterCB.checked onClicked: root.featuresViewer.trackContiguousFilter = trackContiguousFilterCB.checked
} }
} }
@ -114,7 +114,7 @@ FloatingPane {
ToolTip.visible: hovered ToolTip.visible: hovered
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
checked: root.featuresViewer.trackInliersFilter checked: root.featuresViewer ? root.featuresViewer.trackInliersFilter : false
onClicked: root.featuresViewer.trackInliersFilter = trackInliersFilterCB.checked onClicked: root.featuresViewer.trackInliersFilter = trackInliersFilterCB.checked
} }
} }
@ -128,7 +128,7 @@ FloatingPane {
ToolTip.visible: hovered ToolTip.visible: hovered
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
checked: root.featuresViewer.display3dTracks checked: root.featuresViewer ? root.featuresViewer.display3dTracks : false
onClicked: root.featuresViewer.display3dTracks = display3dTracksCB.checked onClicked: root.featuresViewer.display3dTracks = display3dTracksCB.checked
} }
} }
@ -158,7 +158,7 @@ FloatingPane {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
from: -1 from: -1
to: 50 to: 50
value: root.featuresViewer.timeWindow value: root.featuresViewer ? root.featuresViewer.timeWindow : 0
stepSize: 1 stepSize: 1
editable: true editable: true
@ -175,6 +175,7 @@ FloatingPane {
} }
onValueChanged: { onValueChanged: {
if (root.featuresViewer)
root.featuresViewer.timeWindow = timeWindowSB.value; root.featuresViewer.timeWindow = timeWindowSB.value;
} }
} }

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

@ -460,7 +460,7 @@ FocusScope {
'isHighlightable': Qt.binding(function(){ return panoramaViewerToolbar.enableHover;}), 'isHighlightable': Qt.binding(function(){ return panoramaViewerToolbar.enableHover;}),
'displayGridPano': Qt.binding(function(){ return panoramaViewerToolbar.displayGrid;}), 'displayGridPano': Qt.binding(function(){ return panoramaViewerToolbar.displayGrid;}),
'mouseMultiplier': Qt.binding(function(){ return panoramaViewerToolbar.mouseSpeed;}), 'mouseMultiplier': Qt.binding(function(){ return panoramaViewerToolbar.mouseSpeed;}),
'msfmData': Qt.binding(function() { return (msfmDataLoader.status === Loader.Ready 'msfmData': Qt.binding(function() { return (msfmDataLoader && msfmDataLoader.item && msfmDataLoader.status === Loader.Ready
&& msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }), && msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }),
}) })
} else { } else {