GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 04:43:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved result checking to the Dialog

Browse Source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-16 13:15:15 +01:00
parent 100e1f4f40
commit b59be4c88b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -92,13 +92,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if self._dialog.getResult() == {}: if self._dialog.getResult() == {}:
return WorkspaceReader.PreReadResult.cancelled return WorkspaceReader.PreReadResult.cancelled
result = self._dialog.getResult() self._resolve_strategies = 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
return WorkspaceReader.PreReadResult.accepted return WorkspaceReader.PreReadResult.accepted

4
plugins/3MFReader/WorkspaceDialog.py
View File

@ -50,6 +50,10 @@ class WorkspaceDialog(QObject):
self.qualityChangesConflictChanged.emit() self.qualityChangesConflictChanged.emit()
def getResult(self): 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 return self._result
def _createViewFromQML(self): def _createViewFromQML(self):