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

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
fieldOfView 2016-08-04 13:25:41 +02:00
commit de3edffe3e
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py
View File

@ -59,12 +59,12 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
definition = self._stack.getSettingDefinition(item) definition = self._stack.getSettingDefinition(item)
if definition: if definition:
new_instance = SettingInstance(definition, settings) new_instance = SettingInstance(definition, settings)
if definition.global_inherits_stack: if definition.global_inherits_stack and self._stack.getProperty("machine_extruder_count", "value") > 1:
#Obtain the value from the correct container stack. Only once, upon adding the setting. #Obtain the value from the correct container stack. Only once, upon adding the setting.
stack_nr = self._stack.getProperty(item, "global_inherits_stack") #Stack to get the setting from. stack_nr = self._stack.getProperty(item, "global_inherits_stack") #Stack to get the setting from.
if int(stack_nr) >= 0: #Only if it defines an extruder stack. if int(stack_nr) >= 0: #Only if it defines an extruder stack.
extruder_stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0] extruder_stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0]
new_instance.value = extruder_stack.getProperty(item, "value") new_instance.setProperty("value", extruder_stack.getProperty(item, "value"))
settings.addInstance(new_instance) settings.addInstance(new_instance)
visibility_changed = True visibility_changed = True
else: else:

6
resources/definitions/fdmprinter.def.json
View File

@ -1053,7 +1053,7 @@
"unit": "°C", "unit": "°C",
"type": "float", "type": "float",
"default_value": 210, "default_value": 210,
"minimum_value": "0", "minimum_value": "-273.15",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "not (material_flow_dependent_temperature)", "enabled": "not (material_flow_dependent_temperature)",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -1090,7 +1090,7 @@
"unit": "°C", "unit": "°C",
"type": "float", "type": "float",
"default_value": 60, "default_value": 60,
"minimum_value": "0", "minimum_value": "-273.15",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"enabled": "machine_heated_bed", "enabled": "machine_heated_bed",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -1269,7 +1269,7 @@
"type": "float", "type": "float",
"unit": "°C", "unit": "°C",
"default_value": 150, "default_value": 150,
"minimum_value": "0", "minimum_value": "-273.15",
"maximum_value_warning": "260", "maximum_value_warning": "260",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true

11
resources/definitions/ultimaker.def.json
View File

@ -7,5 +7,16 @@
"author": "Ultimaker", "author": "Ultimaker",
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"visible": false "visible": false
},
"overrides": {
"material_print_temperature": {
"minimum_value": "0"
},
"material_bed_temperature": {
"minimum_value": "0"
},
"material_standby_temperature": {
"minimum_value": "0"
}
} }
} }