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

Conflict in quality changes is now handled less naive

Browse Source 
Instead of only checking ID, we also check values of the QC

CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-16 13:10:42 +01:00
parent fcd4fb86f5
commit 100e1f4f40
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -78,7 +78,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# Check if quality changes already exists. # Check if quality changes already exists.
quality_changes = self._container_registry.findInstanceContainers(id = container_id) quality_changes = self._container_registry.findInstanceContainers(id = container_id)
if quality_changes: if quality_changes:
quality_changes_conflict = True # Check if there really is a conflict by comparing the values
if quality_changes[0] != instance_container:
quality_changes_conflict = True
break
if machine_conflict or quality_changes_conflict: if machine_conflict or quality_changes_conflict:
# There is a conflict; User should choose to either update the existing data, add everything as new data or abort # There is a conflict; User should choose to either update the existing data, add everything as new data or abort

2
plugins/3MFReader/WorkspaceDialog.py
View File

@ -43,9 +43,11 @@ class WorkspaceDialog(QObject):
def setMachineConflict(self, machine_conflict): def setMachineConflict(self, machine_conflict):
self._has_machine_conflict = machine_conflict self._has_machine_conflict = machine_conflict
self.machineConflictChanged.emit()
def setQualityChangesConflict(self, quality_changes_conflict): def setQualityChangesConflict(self, quality_changes_conflict):
self._has_quality_changes_conflict = quality_changes_conflict self._has_quality_changes_conflict = quality_changes_conflict
self.qualityChangesConflictChanged.emit()
def getResult(self): def getResult(self):
return self._result return self._result