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

Merge branch '2.3'

Browse Source
This commit is contained in:
Simon Edwards 2016-10-31 13:30:20 +01:00
commit 1fbd179aaa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Settings/ExtruderManager.py
View File

@ -270,7 +270,11 @@ class ExtruderManager(QObject):
def getAllExtruderValues(self, setting_key): def getAllExtruderValues(self, setting_key):
return self.getAllExtruderSettings(setting_key, "value") return self.getAllExtruderSettings(setting_key, "value")
## Gets a ## Gets a property of a setting for all extruders.
#
# \param setting_key \type{str} The setting to get the property of.
# \param property \type{str} The property to get.
# \return \type{List} the list of results
def getAllExtruderSettings(self, setting_key, property): def getAllExtruderSettings(self, setting_key, property):
global_container_stack = UM.Application.getInstance().getGlobalContainerStack() global_container_stack = UM.Application.getInstance().getGlobalContainerStack()
if global_container_stack.getProperty("machine_extruder_count", "value") <= 1: if global_container_stack.getProperty("machine_extruder_count", "value") <= 1:

2
resources/definitions/ultimaker3.def.json
View File

@ -155,6 +155,6 @@
"wall_0_inset": { "value": "0" }, "wall_0_inset": { "value": "0" },
"wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" }, "wall_thickness": { "value": "1" },
"xy_offset": { "value": "-0.14" } "xy_offset": { "value": "-0.14", "comment": "This is a hack to compensate for oversized prints. CURA-2845" }
} }
} }