mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-06-04 11:14:21 +08:00
Moved result checking to the Dialog
CURA-1263
This commit is contained in:
parent
100e1f4f40
commit
b59be4c88b
@ -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
|
||||
|
||||
|
@ -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):
|
||||
|
Loading…
x
Reference in New Issue
Block a user