|
@@ -52,7 +52,6 @@ class WorkspaceDialog(QObject):
|
|
|
|
|
|
machineConflictChanged = pyqtSignal()
|
|
|
qualityChangesConflictChanged = pyqtSignal()
|
|
|
- definitionChangesConflictChanged = pyqtSignal()
|
|
|
materialConflictChanged = pyqtSignal()
|
|
|
numVisibleSettingsChanged = pyqtSignal()
|
|
|
activeModeChanged = pyqtSignal()
|
|
@@ -196,10 +195,6 @@ class WorkspaceDialog(QObject):
|
|
|
def qualityChangesConflict(self):
|
|
|
return self._has_quality_changes_conflict
|
|
|
|
|
|
- @pyqtProperty(bool, notify=definitionChangesConflictChanged)
|
|
|
- def definitionChangesConflict(self):
|
|
|
- return self._has_definition_changes_conflict
|
|
|
-
|
|
|
@pyqtProperty(bool, notify=materialConflictChanged)
|
|
|
def materialConflict(self):
|
|
|
return self._has_material_conflict
|
|
@@ -229,18 +224,11 @@ class WorkspaceDialog(QObject):
|
|
|
self._has_quality_changes_conflict = quality_changes_conflict
|
|
|
self.qualityChangesConflictChanged.emit()
|
|
|
|
|
|
- def setDefinitionChangesConflict(self, definition_changes_conflict):
|
|
|
- if self._has_definition_changes_conflict != definition_changes_conflict:
|
|
|
- self._has_definition_changes_conflict = definition_changes_conflict
|
|
|
- self.definitionChangesConflictChanged.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
|
|
|
- if "definition_changes" in self._result and not self._has_definition_changes_conflict:
|
|
|
- self._result["definition_changes"] = None
|
|
|
if "material" in self._result and not self._has_material_conflict:
|
|
|
self._result["material"] = None
|
|
|
|