Always use extruder stacks when building slicer message and deprecate otherwise - CURA-4482

This commit is contained in:
ChrisTerBeke 2017-10-31 14:48:52 +01:00
parent 911f619000
commit cc267646e7

View file

@ -9,6 +9,7 @@ import time
from UM.Job import Job from UM.Job import Job
from UM.Application import Application from UM.Application import Application
from UM.Logger import Logger from UM.Logger import Logger
from UM.Decorators import deprecated
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
@ -158,13 +159,9 @@ class StartSliceJob(Job):
self._buildGlobalSettingsMessage(stack) self._buildGlobalSettingsMessage(stack)
self._buildGlobalInheritsStackMessage(stack) self._buildGlobalInheritsStackMessage(stack)
# Only add extruder stacks if there are multiple extruders # Build messages for extruder stacks
# Single extruder machines only use the global stack to store setting values for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getId()):
if stack.getProperty("machine_extruder_count", "value") > 1: self._buildExtruderMessage(extruder_stack)
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getId()):
self._buildExtruderMessage(extruder_stack)
else:
self._buildExtruderMessageFromGlobalStack(stack)
for group in object_groups: for group in object_groups:
group_message = self._slice_message.addRepeatedMessage("object_lists") group_message = self._slice_message.addRepeatedMessage("object_lists")
@ -251,6 +248,7 @@ class StartSliceJob(Job):
Job.yieldThread() Job.yieldThread()
## Create extruder message from global stack ## Create extruder message from global stack
@deprecated("Extruder stack is always used since version 3.1, even with single extrusion machines", "3.1")
def _buildExtruderMessageFromGlobalStack(self, stack): def _buildExtruderMessageFromGlobalStack(self, stack):
message = self._slice_message.addRepeatedMessage("extruders") message = self._slice_message.addRepeatedMessage("extruders")