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

Merge branch '4.1'

Browse Source
This commit is contained in:
Ghostkeeper 2019-04-25 10:55:39 +02:00
commit 1da88df399
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -144,7 +144,7 @@ class XmlMaterialProfile(InstanceContainer):
# setting_version is derived from the "version" tag in the schema, so don't serialize it into a file # setting_version is derived from the "version" tag in the schema, so don't serialize it into a file
if ignored_metadata_keys is None: if ignored_metadata_keys is None:
ignored_metadata_keys = set() ignored_metadata_keys = set()
ignored_metadata_keys |= {"setting_version", "definition", "status", "variant", "type", "base_file", "approximate_diameter", "id", "container_type", "name"} ignored_metadata_keys |= {"setting_version", "definition", "status", "variant", "type", "base_file", "approximate_diameter", "id", "container_type", "name", "compatible"}
# remove the keys that we want to ignore in the metadata # remove the keys that we want to ignore in the metadata
for key in ignored_metadata_keys: for key in ignored_metadata_keys:
if key in metadata: if key in metadata:

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

@ -227,7 +227,7 @@
}, },
"extruders_enabled_count": "extruders_enabled_count":
{ {
"label": "Number of Extruders that are enabled", "label": "Number of Extruders That Are Enabled",
"description": "Number of extruder trains that are enabled; automatically set in software", "description": "Number of extruder trains that are enabled; automatically set in software",
"value": "machine_extruder_count", "value": "machine_extruder_count",
"default_value": 1, "default_value": 1,
@ -240,7 +240,7 @@
}, },
"machine_nozzle_tip_outer_diameter": "machine_nozzle_tip_outer_diameter":
{ {
"label": "Outer nozzle diameter", "label": "Outer Nozzle Diameter",
"description": "The outer diameter of the tip of the nozzle.", "description": "The outer diameter of the tip of the nozzle.",
"unit": "mm", "unit": "mm",
"default_value": 1, "default_value": 1,
@ -252,7 +252,7 @@
}, },
"machine_nozzle_head_distance": "machine_nozzle_head_distance":
{ {
"label": "Nozzle length", "label": "Nozzle Length",
"description": "The height difference between the tip of the nozzle and the lowest part of the print head.", "description": "The height difference between the tip of the nozzle and the lowest part of the print head.",
"unit": "mm", "unit": "mm",
"default_value": 3, "default_value": 3,
@ -263,7 +263,7 @@
}, },
"machine_nozzle_expansion_angle": "machine_nozzle_expansion_angle":
{ {
"label": "Nozzle angle", "label": "Nozzle Angle",
"description": "The angle between the horizontal plane and the conical part right above the tip of the nozzle.", "description": "The angle between the horizontal plane and the conical part right above the tip of the nozzle.",
"unit": "°", "unit": "°",
"type": "int", "type": "int",
@ -276,7 +276,7 @@
}, },
"machine_heat_zone_length": "machine_heat_zone_length":
{ {
"label": "Heat zone length", "label": "Heat Zone Length",
"description": "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament.", "description": "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament.",
"unit": "mm", "unit": "mm",
"default_value": 16, "default_value": 16,
@ -310,7 +310,7 @@
}, },
"machine_nozzle_heat_up_speed": "machine_nozzle_heat_up_speed":
{ {
"label": "Heat up speed", "label": "Heat Up Speed",
"description": "The speed (°C/s) by which the nozzle heats up averaged over the window of normal printing temperatures and the standby temperature.", "description": "The speed (°C/s) by which the nozzle heats up averaged over the window of normal printing temperatures and the standby temperature.",
"default_value": 2.0, "default_value": 2.0,
"unit": "°C/s", "unit": "°C/s",
@ -321,7 +321,7 @@
}, },
"machine_nozzle_cool_down_speed": "machine_nozzle_cool_down_speed":
{ {
"label": "Cool down speed", "label": "Cool Down Speed",
"description": "The speed (°C/s) by which the nozzle cools down averaged over the window of normal printing temperatures and the standby temperature.", "description": "The speed (°C/s) by which the nozzle cools down averaged over the window of normal printing temperatures and the standby temperature.",
"default_value": 2.0, "default_value": 2.0,
"unit": "°C/s", "unit": "°C/s",
@ -343,7 +343,7 @@
}, },
"machine_gcode_flavor": "machine_gcode_flavor":
{ {
"label": "G-code flavour", "label": "G-code Flavour",
"description": "The type of g-code to be generated.", "description": "The type of g-code to be generated.",
"type": "enum", "type": "enum",
"options": "options":
@ -376,7 +376,7 @@
}, },
"machine_disallowed_areas": "machine_disallowed_areas":
{ {
"label": "Disallowed areas", "label": "Disallowed Areas",
"description": "A list of polygons with areas the print head is not allowed to enter.", "description": "A list of polygons with areas the print head is not allowed to enter.",
"type": "polygons", "type": "polygons",
"default_value": "default_value":
@ -400,7 +400,7 @@
}, },
"machine_head_polygon": "machine_head_polygon":
{ {
"label": "Machine head polygon", "label": "Machine Head Polygon",
"description": "A 2D silhouette of the print head (fan caps excluded).", "description": "A 2D silhouette of the print head (fan caps excluded).",
"type": "polygon", "type": "polygon",
"default_value": "default_value":
@ -428,7 +428,7 @@
}, },
"machine_head_with_fans_polygon": "machine_head_with_fans_polygon":
{ {
"label": "Machine head & Fan polygon", "label": "Machine Head & Fan Polygon",
"description": "A 2D silhouette of the print head (fan caps included).", "description": "A 2D silhouette of the print head (fan caps included).",
"type": "polygon", "type": "polygon",
"default_value": "default_value":
@ -456,7 +456,7 @@
}, },
"gantry_height": "gantry_height":
{ {
"label": "Gantry height", "label": "Gantry Height",
"description": "The height difference between the tip of the nozzle and the gantry system (X and Y axes).", "description": "The height difference between the tip of the nozzle and the gantry system (X and Y axes).",
"default_value": 99999999999, "default_value": 99999999999,
"value": "machine_height", "value": "machine_height",
@ -488,7 +488,7 @@
}, },
"machine_use_extruder_offset_to_offset_coords": "machine_use_extruder_offset_to_offset_coords":
{ {
"label": "Offset With Extruder", "label": "Offset with Extruder",
"description": "Apply the extruder offset to the coordinate system.", "description": "Apply the extruder offset to the coordinate system.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
@ -6673,7 +6673,7 @@
}, },
"adaptive_layer_height_enabled": "adaptive_layer_height_enabled":
{ {
"label": "Use adaptive layers", "label": "Use Adaptive Layers",
"description": "Adaptive layers computes the layer heights depending on the shape of the model.", "description": "Adaptive layers computes the layer heights depending on the shape of the model.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
@ -6683,7 +6683,7 @@
}, },
"adaptive_layer_height_variation": "adaptive_layer_height_variation":
{ {
"label": "Adaptive layers maximum variation", "label": "Adaptive Layers Maximum Variation",
"description": "The maximum allowed height different from the base layer height.", "description": "The maximum allowed height different from the base layer height.",
"type": "float", "type": "float",
"enabled": "adaptive_layer_height_enabled", "enabled": "adaptive_layer_height_enabled",
@ -6695,7 +6695,7 @@
}, },
"adaptive_layer_height_variation_step": "adaptive_layer_height_variation_step":
{ {
"label": "Adaptive layers variation step size", "label": "Adaptive Layers Variation Step Size",
"description": "The difference in height of the next layer height compared to the previous one.", "description": "The difference in height of the next layer height compared to the previous one.",
"type": "float", "type": "float",
"enabled": "adaptive_layer_height_enabled", "enabled": "adaptive_layer_height_enabled",
@ -6708,7 +6708,7 @@
}, },
"adaptive_layer_height_threshold": "adaptive_layer_height_threshold":
{ {
"label": "Adaptive layers threshold", "label": "Adaptive Layers Threshold",
"description": "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer.", "description": "Threshold whether to use a smaller layer or not. This number is compared to the tan of the steepest slope in a layer.",
"type": "float", "type": "float",
"enabled": "adaptive_layer_height_enabled", "enabled": "adaptive_layer_height_enabled",
@ -7179,41 +7179,47 @@
} }
} }
}, },
"command_line_settings": { "command_line_settings":
{
"label": "Command Line Settings", "label": "Command Line Settings",
"description": "Settings which are only used if CuraEngine isn't called from the Cura frontend.", "description": "Settings which are only used if CuraEngine isn't called from the Cura frontend.",
"type": "category", "type": "category",
"enabled": false, "enabled": false,
"children": { "children": {
"center_object": { "center_object":
{
"description": "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved.", "description": "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved.",
"type": "bool", "type": "bool",
"label": "Center Object", "label": "Center Object",
"default_value": false, "default_value": false,
"enabled": false "enabled": false
}, },
"mesh_position_x": { "mesh_position_x":
{
"description": "Offset applied to the object in the x direction.", "description": "Offset applied to the object in the x direction.",
"type": "float", "type": "float",
"label": "Mesh Position X", "label": "Mesh Position X",
"default_value": 0, "default_value": 0,
"enabled": false "enabled": false
}, },
"mesh_position_y": { "mesh_position_y":
{
"description": "Offset applied to the object in the y direction.", "description": "Offset applied to the object in the y direction.",
"type": "float", "type": "float",
"label": "Mesh Position Y", "label": "Mesh Position Y",
"default_value": 0, "default_value": 0,
"enabled": false "enabled": false
}, },
"mesh_position_z": { "mesh_position_z":
{
"description": "Offset applied to the object in the z direction. With this you can perform what was used to be called 'Object Sink'.", "description": "Offset applied to the object in the z direction. With this you can perform what was used to be called 'Object Sink'.",
"type": "float", "type": "float",
"label": "Mesh Position Z", "label": "Mesh Position Z",
"default_value": 0, "default_value": 0,
"enabled": false "enabled": false
}, },
"mesh_rotation_matrix": { "mesh_rotation_matrix":
{
"label": "Mesh Rotation Matrix", "label": "Mesh Rotation Matrix",
"description": "Transformation matrix to be applied to the model when loading it from file.", "description": "Transformation matrix to be applied to the model when loading it from file.",
"type": "str", "type": "str",