From b59be4c88b51c36aabca307cf4b92b3a31dbfc57 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 16 Nov 2016 13:15:15 +0100 Subject: [PATCH] Moved result checking to the Dialog CURA-1263 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 8 +------- plugins/3MFReader/WorkspaceDialog.py | 4 ++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 998fee5ccb..0a25e5369e 100644 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -92,13 +92,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if self._dialog.getResult() == {}: return WorkspaceReader.PreReadResult.cancelled - result = self._dialog.getResult() - # If there is no conflict, ignore the data. - if not machine_conflict: - result["machine"] = None - if not quality_changes_conflict: - result["quality_changes"] = None - self._resolve_strategies = result + self._resolve_strategies = self._dialog.getResult() return WorkspaceReader.PreReadResult.accepted diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index bbac4fb557..8d98de05d2 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -50,6 +50,10 @@ class WorkspaceDialog(QObject): self.qualityChangesConflictChanged.emit() def getResult(self): + if "machine" in self._result and not self._has_machine_conflict: + self._result["machine"] = None + if "quality_changes" in self._result and not self._has_quality_changes_conflict: + self._result["quality_changes"] = None return self._result def _createViewFromQML(self):