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

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

Browse Source
This commit is contained in:
fieldOfView 2016-03-15 18:05:57 +01:00
commit f904d3aa74
4 changed files with 71 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -237,7 +237,7 @@ Item {
delegate: ToolButton {
id: button;
x: model.depth * UM.Theme.getSize("default_margin").width;
x: model.visible_depth * UM.Theme.getSize("default_margin").width;
text: model.name;
tooltip: model.description;
visible: !model.global_only

1
plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
View File

@ -26,6 +26,7 @@ class RemovableDriveOutputDevice(OutputDevice):
self._writing = False
def requestWrite(self, node, file_name = None, filter_by_machine = False):
filter_by_machine = True # This plugin is indended to be used by machine (regardless of what it was told to do)
if self._writing:
raise OutputDeviceError.DeviceBusyError()

136
resources/machines/fdmprinter.json
View File

@ -374,14 +374,6 @@
}
}
},
"alternate_extra_perimeter": {
"label": "Alternate Extra Wall",
"description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.",
"type": "boolean",
"default": false,
"visible": false,
"inherit": false
},
"top_bottom_thickness": {
"label": "Bottom/Top Thickness",
"description": "This controls the thickness of the bottom and top layers. The number of solid layers put down is calculated from the layer thickness and this value. Having this value a multiple of the layer thickness makes sense. Keep it near your wall thickness to make an evenly strong part.",
@ -439,6 +431,15 @@
}
}
},
"alternate_extra_perimeter": {
"label": "Alternate Extra Wall",
"description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.",
"type": "boolean",
"default": false,
"visible": false,
"inherit": false
},
"remove_overlapping_walls_enabled": {
"label": "Remove Overlapping Wall Parts",
"description": "Remove parts of a wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin pieces in a model and sharp corners.",
@ -996,22 +997,20 @@
"default": true,
"visible": false,
"enabled": "retraction_combing",
"global_only": "True",
"children": {
"travel_avoid_distance": {
"label": "Avoid Distance",
"description": "The distance to stay clear of parts which are avoided during travel.",
"unit": "mm",
"type": "float",
"default": 1.5,
"min_value": "0",
"max_value_warning": "machine_nozzle_tip_outer_diameter * 5",
"visible": false,
"inherit": false,
"enabled": "retraction_combing",
"global_only": "True"
}
}
"global_only": "True"
},
"travel_avoid_distance": {
"label": "Avoid Distance",
"description": "The distance to stay clear of parts which are avoided during travel.",
"unit": "mm",
"type": "float",
"default": 1.5,
"min_value": "0",
"max_value_warning": "machine_nozzle_tip_outer_diameter * 5",
"visible": false,
"inherit": false,
"enabled": "retraction_combing and travel_avoid_other_parts",
"global_only": "True"
},
"coasting_enable": {
"label": "Enable Coasting",
@ -1071,43 +1070,44 @@
"description": "Enable the cooling fan during the print. The extra cooling from the cooling fan helps parts with small cross sections that print each layer quickly.",
"type": "boolean",
"default": true,
"global_only": "True"
},
"cool_fan_speed": {
"label": "Fan Speed",
"description": "Fan speed used for the print cooling fan on the printer head.",
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "100",
"default": 100,
"visible": false,
"inherit_function": "100.0 if cool_fan_enabled else 0.0",
"enabled": "cool_fan_enabled",
"global_only": "True",
"children": {
"cool_fan_speed": {
"label": "Fan Speed",
"description": "Fan speed used for the print cooling fan on the printer head.",
"cool_fan_speed_min": {
"label": "Minimum Fan Speed",
"description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.",
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "100",
"default": 100,
"visible": false,
"inherit_function": "100.0 if parent_value else 0.0",
"global_only": "True",
"children": {
"cool_fan_speed_min": {
"label": "Minimum Fan Speed",
"description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.",
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "100",
"default": 100,
"visible": false,
"global_only": "True"
},
"cool_fan_speed_max": {
"label": "Maximum Fan Speed",
"description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.",
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "100",
"default": 100,
"visible": false,
"global_only": "True"
}
}
"enabled": "cool_fan_enabled",
"global_only": "True"
},
"cool_fan_speed_max": {
"label": "Maximum Fan Speed",
"description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.",
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "100",
"default": 100,
"visible": false,
"enabled": "cool_fan_enabled",
"global_only": "True"
}
}
},
@ -1457,22 +1457,20 @@
"min_value": "0",
"max_value_warning": "10",
"visible": false,
"enabled": "support_enable and support_use_towers",
"children": {
"support_minimal_diameter": {
"label": "Minimum Diameter",
"description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.",
"unit": "mm",
"type": "float",
"default": 3.0,
"min_value": "0",
"max_value_warning": "10",
"max_value": "support_tower_diameter",
"inherit": true,
"visible": false,
"enabled": "support_enable and support_use_towers"
}
}
"enabled": "support_enable and support_use_towers"
},
"support_minimal_diameter": {
"label": "Minimum Diameter",
"description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.",
"unit": "mm",
"type": "float",
"default": 3.0,
"min_value": "0",
"max_value_warning": "10",
"max_value": "support_tower_diameter",
"inherit": true,
"visible": false,
"enabled": "support_enable and support_use_towers"
},
"support_tower_roof_angle": {
"label": "Tower Roof Angle",

4
resources/machines/ultimaker2.json
View File

@ -40,8 +40,8 @@
"machine_settings": {
"machine_start_gcode" : { "default": "" },
"machine_end_gcode" : { "default": "" },
"machine_width": { "default": 230 },
"machine_depth": { "default": 225 },
"machine_width": { "default": 223 },
"machine_depth": { "default": 223 },
"machine_height": { "default": 205 },
"machine_heated_bed": { "default": true },