GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-03 08:15:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cura_containerstack' of github.com:Ultimaker/Cura into cura_containerstack

Browse Source
This commit is contained in:
Ghostkeeper 2017-04-07 09:31:17 +02:00
commit 0fe1b54588
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Settings/ExtruderStack.py
View File

@ -18,6 +18,8 @@ class ExtruderStack(CuraContainerStack):
def __init__(self, container_id, *args, **kwargs): def __init__(self, container_id, *args, **kwargs):
super().__init__(container_id, *args, **kwargs) super().__init__(container_id, *args, **kwargs)
self.addMetaDataEntry("type", "extruder_train") # For backward compatibility
@override(ContainerStack) @override(ContainerStack)
def setNextStack(self, stack): def setNextStack(self, stack):
super().setNextStack(stack) super().setNextStack(stack)

2
cura/Settings/GlobalStack.py
View File

@ -21,6 +21,8 @@ class GlobalStack(CuraContainerStack):
def __init__(self, container_id: str, *args, **kwargs): def __init__(self, container_id: str, *args, **kwargs):
super().__init__(container_id, *args, **kwargs) super().__init__(container_id, *args, **kwargs)
self.addMetaDataEntry("type", "machine") # For backward compatibility
self._extruders = [] self._extruders = []
self._resolving_property = None self._resolving_property = None

2
cura/Settings/MachineManager.py
View File

@ -500,7 +500,6 @@ class MachineManager(QObject):
return "" return ""
@pyqtProperty(str, notify = globalContainerChanged) @pyqtProperty(str, notify = globalContainerChanged)
@deprecated("Use activeMachine.name", "2.6")
def activeMachineName(self) -> str: def activeMachineName(self) -> str:
if self._global_container_stack: if self._global_container_stack:
return self._global_container_stack.getName() return self._global_container_stack.getName()
@ -508,7 +507,6 @@ class MachineManager(QObject):
return "" return ""
@pyqtProperty(str, notify = globalContainerChanged) @pyqtProperty(str, notify = globalContainerChanged)
@deprecated("Use activeMachine.id", "2.6")
def activeMachineId(self) -> str: def activeMachineId(self) -> str:
if self._global_container_stack: if self._global_container_stack:
return self._global_container_stack.getId() return self._global_container_stack.getId()

15
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -230,20 +230,7 @@ class StartSliceJob(Job):
keys = stack.getAllKeys() keys = stack.getAllKeys()
settings = {} settings = {}
for key in keys: for key in keys:
# Use resolvement value if available, or take the value settings[key] = stack.getProperty(key, "value")
resolved_value = stack.getProperty(key, "resolve")
if resolved_value is not None:
# There is a resolvement value. Check if we need to use it.
user_container = stack.findContainer({"type": "user"})
quality_changes_container = stack.findContainer({"type": "quality_changes"})
if user_container.hasProperty(key,"value") or quality_changes_container.hasProperty(key,"value"):
# Normal case
settings[key] = stack.getProperty(key, "value")
else:
settings[key] = resolved_value
else:
# Normal case
settings[key] = stack.getProperty(key, "value")
Job.yieldThread() Job.yieldThread()
start_gcode = settings["machine_start_gcode"] start_gcode = settings["machine_start_gcode"]

2
resources/qml/Menus/ProfileMenu.qml
View File

@ -19,7 +19,7 @@ Menu
{ {
text: model.name + " - " + model.layer_height text: model.name + " - " + model.layer_height
checkable: true checkable: true
checked: Cura.MachineManager.activeQualityChangesId == "empty_quality_changes" && Cura.MachineManager.activeQualityType == model.metadata.quality_type checked: Cura.MachineManager.activeQualityChangesId == "" && Cura.MachineManager.activeQualityType == model.metadata.quality_type
exclusiveGroup: group exclusiveGroup: group
onTriggered: Cura.MachineManager.setActiveQuality(model.id) onTriggered: Cura.MachineManager.setActiveQuality(model.id)
} }