[ui] Viewer2D: Fix warnings on some null attributes

Fix the QML warning "TypeError: Cannot read property 'status' of
null".
This commit is contained in:
Candice Bentéjac 2022-10-10 18:23:03 +02:00
parent ff4620dc2f
commit 6cbeeebb9c

View file

@ -94,7 +94,7 @@ FocusScope {
} }
if(msfmDataLoader.status === Loader.Ready) if(msfmDataLoader.status === Loader.Ready)
{ {
if(msfmDataLoader.item.status === MSfMData.Loading) if(msfmDataLoader.item != null && msfmDataLoader.item.status === MSfMData.Loading)
{ {
res += " SfMData"; res += " SfMData";
} }
@ -309,7 +309,7 @@ FocusScope {
'surface.subdivisions' : Qt.binding(function(){ return root.useFloatImageViewer ? 1 : lensDistortionImageToolbar.subdivisionsValue;}), 'surface.subdivisions' : Qt.binding(function(){ return root.useFloatImageViewer ? 1 : lensDistortionImageToolbar.subdivisionsValue;}),
'viewerTypeString': Qt.binding(function(){ return displayLensDistortionViewer.checked ? "distortion" : "hdr";}), 'viewerTypeString': Qt.binding(function(){ return displayLensDistortionViewer.checked ? "distortion" : "hdr";}),
'sfmRequired': Qt.binding(function(){ return displayLensDistortionViewer.checked ? true : false;}), 'sfmRequired': Qt.binding(function(){ return displayLensDistortionViewer.checked ? true : false;}),
'surface.msfmData': Qt.binding(function() { return (msfmDataLoader.status === Loader.Ready && msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }), 'surface.msfmData': Qt.binding(function() { return (msfmDataLoader.status === Loader.Ready && msfmDataLoader.item != null && msfmDataLoader.item.status === 2) ? msfmDataLoader.item : null; }),
'canBeHovered': false, 'canBeHovered': false,
'idView': Qt.binding(function() { return _reconstruction.selectedViewId; }), 'idView': Qt.binding(function() { return _reconstruction.selectedViewId; }),
'cropFisheye': false 'cropFisheye': false