From 9662aefa37b749b0725007240dc524e1b63eccda Mon Sep 17 00:00:00 2001
From: "c.lamboo" <casperlamboo@gmail.com>
Date: Wed, 20 Mar 2024 13:34:41 +0100
Subject: [PATCH 1/2] Revert "Update model data handling in 3MFReader plugin"

This reverts commit 4da17d643d91cb10b0185770c550dfc0f147e38f.
---
 plugins/3MFReader/WorkspaceDialog.py  | 4 ++++
 plugins/3MFReader/WorkspaceDialog.qml | 9 +--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py
index bc4581b749..c3e4187652 100644
--- a/plugins/3MFReader/WorkspaceDialog.py
+++ b/plugins/3MFReader/WorkspaceDialog.py
@@ -362,6 +362,10 @@ class WorkspaceDialog(QObject):
     def exportedSettingModel(self):
         return self._exported_settings_model
 
+    @pyqtProperty("QVariantList", notify=exportedSettingModelChanged)
+    def exportedSettingModelItems(self):
+        return self._exported_settings_model.items
+
     @pyqtProperty(int, notify=exportedSettingModelChanged)
     def exportedSettingModelRowCount(self):
         return self._exported_settings_model.rowCount()
diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index febd082a4c..d7e776411f 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -209,16 +209,9 @@ UM.Dialog
                             {
                                 id: tableModel
                                 headers: ["category", "label", "value"]
-                                rows: manager.exportedSettingModel.items
+                                rows: manager.exportedSettingModelItems
                             }
                         }
-
-                        property var modelRows: manager.exportedSettingModel.items
-                        onModelRowsChanged:
-                        {
-                            tableModel.clear()
-                            tableModel.rows = modelRows
-                        }
                     }
 
                     comboboxVisible: manager.qualityChangesConflict

From 35d3ff2b5c23dcc92c72fcb1fdeacbfcf4ece870 Mon Sep 17 00:00:00 2001
From: "c.lamboo" <casperlamboo@gmail.com>
Date: Wed, 20 Mar 2024 13:35:24 +0100
Subject: [PATCH 2/2] Only emit model once when all items have been added

CURA-11720
---
 plugins/3MFReader/SpecificSettingsModel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/3MFReader/SpecificSettingsModel.py b/plugins/3MFReader/SpecificSettingsModel.py
index ec4a68e337..af203ad759 100644
--- a/plugins/3MFReader/SpecificSettingsModel.py
+++ b/plugins/3MFReader/SpecificSettingsModel.py
@@ -41,7 +41,7 @@ class SpecificSettingsModel(ListModel):
                 "label": stack.getProperty(setting, "label"),
                 "value": value
             })
-            self.modelChanged.emit()
+        self.modelChanged.emit()
 
     def _update(self):
         Logger.debug(f"Updating {self.__class__.__name__}")