mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 23:17:32 -06:00
Merge remote-tracking branch 'upstream/2.6'
This commit is contained in:
commit
fe5466872f
1 changed files with 15 additions and 0 deletions
|
@ -154,6 +154,8 @@ class StartSliceJob(Job):
|
||||||
if stack.getProperty("machine_extruder_count", "value") > 1:
|
if stack.getProperty("machine_extruder_count", "value") > 1:
|
||||||
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getId()):
|
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getId()):
|
||||||
self._buildExtruderMessage(extruder_stack)
|
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")
|
||||||
|
@ -226,6 +228,19 @@ class StartSliceJob(Job):
|
||||||
setting.value = str(stack.getProperty(key, "value")).encode("utf-8")
|
setting.value = str(stack.getProperty(key, "value")).encode("utf-8")
|
||||||
Job.yieldThread()
|
Job.yieldThread()
|
||||||
|
|
||||||
|
## Create extruder message from global stack
|
||||||
|
def _buildExtruderMessageFromGlobalStack(self, stack):
|
||||||
|
message = self._slice_message.addRepeatedMessage("extruders")
|
||||||
|
|
||||||
|
for key in stack.getAllKeys():
|
||||||
|
# Do not send settings that are not settable_per_extruder.
|
||||||
|
if not stack.getProperty(key, "settable_per_extruder"):
|
||||||
|
continue
|
||||||
|
setting = message.getMessage("settings").addRepeatedMessage("settings")
|
||||||
|
setting.name = key
|
||||||
|
setting.value = str(stack.getProperty(key, "value")).encode("utf-8")
|
||||||
|
Job.yieldThread()
|
||||||
|
|
||||||
## Sends all global settings to the engine.
|
## Sends all global settings to the engine.
|
||||||
#
|
#
|
||||||
# The settings are taken from the global stack. This does not include any
|
# The settings are taken from the global stack. This does not include any
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue