Merge pull request #2655 from alicevision/fix/crashIntrinsics

[ImageGallery] Intrinsics table: Always fully instantiate the model before populating it

Author: yann-lty

meshroom/ui/qml/ImageGallery/ImageGallery.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQml.Models
-import Qt.labs.qmlmodels 1.0
+import Qt.labs.qmlmodels
 
 import Controls 1.0
 import MaterialIcons 2.2
@@ -75,6 +75,11 @@ Panel {
     }
 
     function populate_model() {
+        if (!intrinsicModel.ready) {
+            // If the TableModel is not done being instantiated, do nothing
+            return
+        }
+
         intrinsicModel.clear()
         for (var intr in parsedIntrinsic) {
             intrinsicModel.appendRow(parsedIntrinsic[intr])
@@ -552,8 +557,10 @@ Panel {
                 anchors.fill: parent
                 boundsMovement : Flickable.StopAtBounds
 
-                //Provide width for column
-                //Note no size provided for the last column (bool comp) so it uses its automated size
+                palette: root.palette
+
+                // Provide width for column
+                // Note no size provided for the last column (bool comp) so it uses its automated size
                 columnWidthProvider: function (column) { return intrinsicModel.columnWidths[column] }
 
                 model: intrinsicModel
@@ -569,6 +576,8 @@ Panel {
 
             TableModel {
                 id : intrinsicModel
+                property bool ready: false
+
                 // Hardcoded default width per column
                 property var columnWidths: [105, 75, 75, 75, 60, 60, 60, 60, 200, 60, 60, 60]
                 property var columnNames: [
@@ -599,6 +608,13 @@ Panel {
                 TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][intrinsicModel.columnNames[10]]} }
                 TableModelColumn { display: function(modelIndex){return parsedIntrinsic[modelIndex.row][intrinsicModel.columnNames[11]]} }
                 //https://doc.qt.io/qt-5/qml-qt-labs-qmlmodels-tablemodel.html#appendRow-method
+
+                Component.onCompleted: {
+                    ready = true
+                    // Triggers "populate_model" in case the intrinsics have been filled while the model was
+                    // being instantiated
+                    root.populate_model()
+                }
             }
 
             //CODE FOR HEADERS

meshroom/ui/qml/ImageGallery/IntrinsicDisplayDelegate.qml

@@ -67,12 +67,12 @@ RowLayout {
             width: intrinsicModel.columnWidths[columnIndex]
             horizontalAlignment: TextInput.AlignRight
             readOnly: root.readOnly
-            color: 'white'
+            color: palette.text
 
             padding: 12
 
             selectByMouse: true
-            selectionColor: 'white'
+            selectionColor: palette.text
             selectedTextColor: Qt.darker(palette.window, 1.1)
 
             onEditingFinished: _reconstruction.setAttribute(attribute, text)
@@ -93,13 +93,13 @@ RowLayout {
             text: model.display.value
             width: intrinsicModel.columnWidths[columnIndex]
             horizontalAlignment: TextInput.AlignRight
-            color: 'white'
+            color: palette.text
             readOnly: root.readOnly
 
             padding: 12
 
             selectByMouse: true
-            selectionColor: 'white'
+            selectionColor: palette.text
             selectedTextColor: Qt.darker(palette.window, 1.1)
 
             IntValidator {
@@ -164,11 +164,11 @@ RowLayout {
             width: intrinsicModel.columnWidths[columnIndex]
             horizontalAlignment: TextInput.AlignRight
 
-            color: 'white'
+            color: palette.text
             padding: 12
 
             selectByMouse: true
-            selectionColor: 'white'
+            selectionColor: palette.text
             selectedTextColor: Qt.darker(palette.window, 1.1)
 
             readOnly: root.readOnly