Conflict in quality changes is now handled less naive

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

View file

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