3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor project loading

Browse source 
CURA-4966
This commit is contained in:
Lipu Fei 2018-03-08 15:43:10 +01:00
parent 6aefb2215d
commit b8d3cbfe16
2 changed files with 482 additions and 723 deletions
Download patch file Download diff file Expand all files Collapse all files

1179
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

File diff suppressed because it is too large Load diff

12
plugins/3MFReader/WorkspaceDialog.py
View file

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