mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 05:23:58 -06:00
Merge branch 'master' into CURA-7996_Fix_trying_to_open_deleted_files_from_the_recent_files_list
This commit is contained in:
Ghostkeeper
commit
ec986990a2
9 changed files with 369 additions and 317 deletions
|
|
@ -301,6 +301,7 @@ class PrintInformation(QObject):
|
|||
if self._base_name == "":
|
||||
self._job_name = self.UNTITLED_JOB_NAME
|
||||
self._is_user_specified_job_name = False
|
||||
self._application.getController().getScene().clearMetaData()
|
||||
self.jobNameChanged.emit()
|
||||
return
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (c) 2019 Ultimaker B.V.
|
||||
# Copyright (c) 2021 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import os.path
|
||||
|
|
@ -163,9 +163,9 @@ class ThreeMFReader(MeshReader):
|
|||
um_node.callDecoration("getStack").getTop().setDefinition(definition_id)
|
||||
|
||||
setting_container = um_node.callDecoration("getStack").getTop()
|
||||
|
||||
known_setting_keys = um_node.callDecoration("getStack").getAllKeys()
|
||||
for key in settings:
|
||||
setting_value = settings[key]
|
||||
setting_value = settings[key].value
|
||||
|
||||
# Extruder_nr is a special case.
|
||||
if key == "extruder_nr":
|
||||
|
|
@ -175,7 +175,10 @@ class ThreeMFReader(MeshReader):
|
|||
else:
|
||||
Logger.log("w", "Unable to find extruder in position %s", setting_value)
|
||||
continue
|
||||
setting_container.setProperty(key, "value", setting_value)
|
||||
if key in known_setting_keys:
|
||||
setting_container.setProperty(key, "value", setting_value)
|
||||
else:
|
||||
um_node.metadata[key] = settings[key]
|
||||
|
||||
if len(um_node.getChildren()) > 0 and um_node.getMeshData() is None:
|
||||
if len(um_node.getAllChildren()) == 1:
|
||||
|
|
@ -206,6 +209,10 @@ class ThreeMFReader(MeshReader):
|
|||
parser = Savitar.ThreeMFParser()
|
||||
scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read())
|
||||
self._unit = scene_3mf.getUnit()
|
||||
|
||||
for key, value in scene_3mf.getMetadata().items():
|
||||
CuraApplication.getInstance().getController().getScene().setMetaDataEntry(key, value)
|
||||
|
||||
for node in scene_3mf.getSceneNodes():
|
||||
um_node = self._convertSavitarNodeToUMNode(node, file_name)
|
||||
if um_node is None:
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ from cura.CuraApplication import CuraApplication
|
|||
import Savitar
|
||||
|
||||
import numpy
|
||||
import datetime
|
||||
|
||||
MYPY = False
|
||||
try:
|
||||
|
|
@ -108,7 +109,11 @@ class ThreeMFWriter(MeshWriter):
|
|||
|
||||
# Get values for all changed settings & save them.
|
||||
for key in changed_setting_keys:
|
||||
savitar_node.setSetting(key, str(stack.getProperty(key, "value")))
|
||||
savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value")))
|
||||
|
||||
# Store the metadata.
|
||||
for key, value in um_node.metadata.items():
|
||||
savitar_node.setSetting(key, value)
|
||||
|
||||
for child_node in um_node.getChildren():
|
||||
# only save the nodes on the active build plate
|
||||
|
|
@ -145,6 +150,22 @@ class ThreeMFWriter(MeshWriter):
|
|||
model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/3D/3dmodel.model", Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel")
|
||||
|
||||
savitar_scene = Savitar.Scene()
|
||||
|
||||
metadata_to_store = CuraApplication.getInstance().getController().getScene().getMetaData()
|
||||
|
||||
for key, value in metadata_to_store.items():
|
||||
savitar_scene.setMetaDataEntry(key, value)
|
||||
|
||||
current_time_string = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
||||
if "Application" not in metadata_to_store:
|
||||
# This might sound a bit strange, but this field should store the original application that created
|
||||
# the 3mf. So if it was already set, leave it to whatever it was.
|
||||
savitar_scene.setMetaDataEntry("Application", CuraApplication.getInstance().getApplicationDisplayName())
|
||||
if "CreationDate" not in metadata_to_store:
|
||||
savitar_scene.setMetaDataEntry("CreationDate", current_time_string)
|
||||
|
||||
savitar_scene.setMetaDataEntry("ModificationDate", current_time_string)
|
||||
|
||||
transformation_matrix = Matrix()
|
||||
transformation_matrix._data[1, 1] = 0
|
||||
transformation_matrix._data[1, 2] = -1
|
||||
|
|
|
|||
|
|
@ -977,7 +977,7 @@
|
|||
},
|
||||
"shell":
|
||||
{
|
||||
"label": "Shell",
|
||||
"label": "Walls",
|
||||
"icon": "category_shell",
|
||||
"description": "Shell",
|
||||
"type": "category",
|
||||
|
|
@ -1066,184 +1066,6 @@
|
|||
"limit_to_extruder": "wall_0_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"roofing_extruder_nr":
|
||||
{
|
||||
"label": "Top Surface Skin Extruder",
|
||||
"description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.",
|
||||
"type": "optional_extruder",
|
||||
"default_value": "-1",
|
||||
"value": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": true,
|
||||
"settable_globally": true,
|
||||
"enabled": "extruders_enabled_count > 1 and max(extruderValues('roofing_layer_count')) > 0 and max(extruderValues('top_layers')) > 0"
|
||||
},
|
||||
"roofing_layer_count":
|
||||
{
|
||||
"label": "Top Surface Skin Layers",
|
||||
"description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.",
|
||||
"default_value": 0,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "top_layers - 1",
|
||||
"type": "int",
|
||||
"value": "0",
|
||||
"limit_to_extruder": "roofing_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"enabled": "top_layers > 0"
|
||||
},
|
||||
"top_bottom_extruder_nr":
|
||||
{
|
||||
"label": "Top/Bottom Extruder",
|
||||
"description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.",
|
||||
"type": "optional_extruder",
|
||||
"default_value": "-1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": true,
|
||||
"settable_globally": true,
|
||||
"enabled": "extruders_enabled_count > 1"
|
||||
},
|
||||
"top_bottom_thickness":
|
||||
{
|
||||
"label": "Top/Bottom Thickness",
|
||||
"description": "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.",
|
||||
"unit": "mm",
|
||||
"default_value": 0.8,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "0.6",
|
||||
"maximum_value": "machine_height",
|
||||
"type": "float",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_thickness":
|
||||
{
|
||||
"label": "Top Thickness",
|
||||
"description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.",
|
||||
"unit": "mm",
|
||||
"default_value": 0.8,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "0.2 + resolveOrValue('layer_height')",
|
||||
"maximum_value": "machine_height",
|
||||
"type": "float",
|
||||
"value": "top_bottom_thickness",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_layers":
|
||||
{
|
||||
"label": "Top Layers",
|
||||
"description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.",
|
||||
"default_value": 8,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "100",
|
||||
"type": "int",
|
||||
"minimum_value_warning": "2",
|
||||
"value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"bottom_thickness":
|
||||
{
|
||||
"label": "Bottom Thickness",
|
||||
"description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.",
|
||||
"unit": "mm",
|
||||
"default_value": 0.6,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "0.2 + resolveOrValue('layer_height')",
|
||||
"type": "float",
|
||||
"value": "top_bottom_thickness",
|
||||
"maximum_value": "machine_height",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"bottom_layers":
|
||||
{
|
||||
"label": "Bottom Layers",
|
||||
"description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "2",
|
||||
"default_value": 6,
|
||||
"type": "int",
|
||||
"value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"initial_bottom_layers":
|
||||
{
|
||||
"label": "Initial Bottom Layers",
|
||||
"description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "2",
|
||||
"default_value": 6,
|
||||
"type": "int",
|
||||
"value": "bottom_layers",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"top_bottom_pattern":
|
||||
{
|
||||
"label": "Top/Bottom Pattern",
|
||||
"description": "The pattern of the top/bottom layers.",
|
||||
"type": "enum",
|
||||
"options":
|
||||
{
|
||||
"lines": "Lines",
|
||||
"concentric": "Concentric",
|
||||
"zigzag": "Zig Zag"
|
||||
},
|
||||
"default_value": "lines",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"top_bottom_pattern_0":
|
||||
{
|
||||
"label": "Bottom Pattern Initial Layer",
|
||||
"description": "The pattern on the bottom of the print on the first layer.",
|
||||
"type": "enum",
|
||||
"options":
|
||||
{
|
||||
"lines": "Lines",
|
||||
"concentric": "Concentric",
|
||||
"zigzag": "Zig Zag"
|
||||
},
|
||||
"default_value": "lines",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"value": "top_bottom_pattern",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"connect_skin_polygons":
|
||||
{
|
||||
"label": "Connect Top/Bottom Polygons",
|
||||
"description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "((top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric') or (initial_bottom_layers > 0 and top_bottom_pattern_0 == 'concentric') or (roofing_layer_count > 0 and roofing_pattern == 'concentric')",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"skin_angles":
|
||||
{
|
||||
"label": "Top/Bottom Line Directions",
|
||||
"description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).",
|
||||
"type": "[int]",
|
||||
"default_value": "[ ]",
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"wall_0_inset":
|
||||
{
|
||||
"label": "Outer Wall Inset",
|
||||
|
|
@ -1495,6 +1317,194 @@
|
|||
"enabled": "z_seam_type == 'back'",
|
||||
"limit_to_extruder": "wall_0_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"top_bottom":
|
||||
{
|
||||
"label": "Top/Bottom",
|
||||
"icon": "category_topbottom",
|
||||
"description": "Top/Bottom",
|
||||
"type": "category",
|
||||
"children":
|
||||
{
|
||||
"roofing_extruder_nr":
|
||||
{
|
||||
"label": "Top Surface Skin Extruder",
|
||||
"description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.",
|
||||
"type": "optional_extruder",
|
||||
"default_value": "-1",
|
||||
"value": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": true,
|
||||
"settable_globally": true,
|
||||
"enabled": "extruders_enabled_count > 1 and max(extruderValues('roofing_layer_count')) > 0 and max(extruderValues('top_layers')) > 0"
|
||||
},
|
||||
"roofing_layer_count":
|
||||
{
|
||||
"label": "Top Surface Skin Layers",
|
||||
"description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.",
|
||||
"default_value": 0,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "top_layers - 1",
|
||||
"type": "int",
|
||||
"value": "0",
|
||||
"limit_to_extruder": "roofing_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"enabled": "top_layers > 0"
|
||||
},
|
||||
"top_bottom_extruder_nr":
|
||||
{
|
||||
"label": "Top/Bottom Extruder",
|
||||
"description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.",
|
||||
"type": "optional_extruder",
|
||||
"default_value": "-1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": true,
|
||||
"settable_globally": true,
|
||||
"enabled": "extruders_enabled_count > 1"
|
||||
},
|
||||
"top_bottom_thickness":
|
||||
{
|
||||
"label": "Top/Bottom Thickness",
|
||||
"description": "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.",
|
||||
"unit": "mm",
|
||||
"default_value": 0.8,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "0.6",
|
||||
"maximum_value": "machine_height",
|
||||
"type": "float",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_thickness":
|
||||
{
|
||||
"label": "Top Thickness",
|
||||
"description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.",
|
||||
"unit": "mm",
|
||||
"default_value": 0.8,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "0.2 + resolveOrValue('layer_height')",
|
||||
"maximum_value": "machine_height",
|
||||
"type": "float",
|
||||
"value": "top_bottom_thickness",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_layers":
|
||||
{
|
||||
"label": "Top Layers",
|
||||
"description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.",
|
||||
"default_value": 8,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "100",
|
||||
"type": "int",
|
||||
"minimum_value_warning": "2",
|
||||
"value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"bottom_thickness":
|
||||
{
|
||||
"label": "Bottom Thickness",
|
||||
"description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.",
|
||||
"unit": "mm",
|
||||
"default_value": 0.6,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "0.2 + resolveOrValue('layer_height')",
|
||||
"type": "float",
|
||||
"value": "top_bottom_thickness",
|
||||
"maximum_value": "machine_height",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"bottom_layers":
|
||||
{
|
||||
"label": "Bottom Layers",
|
||||
"description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "2",
|
||||
"default_value": 6,
|
||||
"type": "int",
|
||||
"value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"initial_bottom_layers":
|
||||
{
|
||||
"label": "Initial Bottom Layers",
|
||||
"description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "2",
|
||||
"default_value": 6,
|
||||
"type": "int",
|
||||
"value": "bottom_layers",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"top_bottom_pattern":
|
||||
{
|
||||
"label": "Top/Bottom Pattern",
|
||||
"description": "The pattern of the top/bottom layers.",
|
||||
"type": "enum",
|
||||
"options":
|
||||
{
|
||||
"lines": "Lines",
|
||||
"concentric": "Concentric",
|
||||
"zigzag": "Zig Zag"
|
||||
},
|
||||
"default_value": "lines",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"top_bottom_pattern_0":
|
||||
{
|
||||
"label": "Bottom Pattern Initial Layer",
|
||||
"description": "The pattern on the bottom of the print on the first layer.",
|
||||
"type": "enum",
|
||||
"options":
|
||||
{
|
||||
"lines": "Lines",
|
||||
"concentric": "Concentric",
|
||||
"zigzag": "Zig Zag"
|
||||
},
|
||||
"default_value": "lines",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"value": "top_bottom_pattern",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"connect_skin_polygons":
|
||||
{
|
||||
"label": "Connect Top/Bottom Polygons",
|
||||
"description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "((top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric') or (initial_bottom_layers > 0 and top_bottom_pattern_0 == 'concentric') or (roofing_layer_count > 0 and roofing_pattern == 'concentric')",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"skin_angles":
|
||||
{
|
||||
"label": "Top/Bottom Line Directions",
|
||||
"description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).",
|
||||
"type": "[int]",
|
||||
"default_value": "[ ]",
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"skin_no_small_gaps_heuristic":
|
||||
{
|
||||
|
|
@ -1666,6 +1676,123 @@
|
|||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"skin_preshrink":
|
||||
{
|
||||
"label": "Skin Removal Width",
|
||||
"description": "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_skin_preshrink":
|
||||
{
|
||||
"label": "Top Skin Removal Width",
|
||||
"description": "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "skin_preshrink",
|
||||
"maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "0",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"bottom_skin_preshrink":
|
||||
{
|
||||
"label": "Bottom Skin Removal Width",
|
||||
"description": "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "skin_preshrink",
|
||||
"maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "0",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"expand_skins_expand_distance":
|
||||
{
|
||||
"label": "Skin Expand Distance",
|
||||
"description": "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "-skin_preshrink",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_skin_expand_distance":
|
||||
{
|
||||
"label": "Top Skin Expand Distance",
|
||||
"description": "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "expand_skins_expand_distance",
|
||||
"minimum_value": "-top_skin_preshrink",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"bottom_skin_expand_distance":
|
||||
{
|
||||
"label": "Bottom Skin Expand Distance",
|
||||
"description": "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "expand_skins_expand_distance",
|
||||
"minimum_value": "-bottom_skin_preshrink",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"max_skin_angle_for_expansion":
|
||||
{
|
||||
"label": "Maximum Skin Angle for Expansion",
|
||||
"description": "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded.",
|
||||
"unit": "°",
|
||||
"type": "float",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "2",
|
||||
"maximum_value": "90",
|
||||
"default_value": 90,
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"min_skin_width_for_expansion":
|
||||
{
|
||||
"label": "Minimum Skin Width for Expansion",
|
||||
"description": "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 0,
|
||||
"value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))",
|
||||
"minimum_value": "0",
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1975,123 +2102,6 @@
|
|||
"limit_to_extruder": "infill_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"skin_preshrink":
|
||||
{
|
||||
"label": "Skin Removal Width",
|
||||
"description": "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_skin_preshrink":
|
||||
{
|
||||
"label": "Top Skin Removal Width",
|
||||
"description": "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "skin_preshrink",
|
||||
"maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "0",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"bottom_skin_preshrink":
|
||||
{
|
||||
"label": "Bottom Skin Removal Width",
|
||||
"description": "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "skin_preshrink",
|
||||
"maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "0",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"expand_skins_expand_distance":
|
||||
{
|
||||
"label": "Skin Expand Distance",
|
||||
"description": "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
|
||||
"minimum_value": "-skin_preshrink",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"top_skin_expand_distance":
|
||||
{
|
||||
"label": "Top Skin Expand Distance",
|
||||
"description": "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "expand_skins_expand_distance",
|
||||
"minimum_value": "-top_skin_preshrink",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"bottom_skin_expand_distance":
|
||||
{
|
||||
"label": "Bottom Skin Expand Distance",
|
||||
"description": "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"value": "expand_skins_expand_distance",
|
||||
"minimum_value": "-bottom_skin_preshrink",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"max_skin_angle_for_expansion":
|
||||
{
|
||||
"label": "Maximum Skin Angle for Expansion",
|
||||
"description": "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded.",
|
||||
"unit": "°",
|
||||
"type": "float",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "2",
|
||||
"maximum_value": "90",
|
||||
"default_value": 90,
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"min_skin_width_for_expansion":
|
||||
{
|
||||
"label": "Minimum Skin Width for Expansion",
|
||||
"description": "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 0,
|
||||
"value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))",
|
||||
"minimum_value": "0",
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"skin_edge_support_thickness":
|
||||
{
|
||||
"label": "Skin Edge Support Thickness",
|
||||
|
|
|
|||
|
|
@ -21,15 +21,17 @@ wall_0_extruder_nr
|
|||
wall_x_extruder_nr
|
||||
wall_thickness
|
||||
wall_line_count
|
||||
optimize_wall_printing_order
|
||||
fill_perimeter_gaps
|
||||
xy_offset
|
||||
|
||||
[top_bottom]
|
||||
top_bottom_extruder_nr
|
||||
top_bottom_thickness
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
optimize_wall_printing_order
|
||||
fill_perimeter_gaps
|
||||
xy_offset
|
||||
ironing_enabled
|
||||
|
||||
[infill]
|
||||
|
|
|
|||
|
|
@ -10,12 +10,14 @@ layer_height
|
|||
[shell]
|
||||
wall_thickness
|
||||
wall_line_count
|
||||
xy_offset
|
||||
|
||||
[top_bottom]
|
||||
top_bottom_thickness
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
xy_offset
|
||||
|
||||
[infill]
|
||||
infill_sparse_density
|
||||
|
|
|
|||
|
|
@ -28,17 +28,6 @@ wall_x_extruder_nr
|
|||
wall_thickness
|
||||
wall_line_count
|
||||
wall_0_wipe_dist
|
||||
roofing_layer_count
|
||||
top_bottom_extruder_nr
|
||||
top_bottom_thickness
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
top_bottom_pattern
|
||||
top_bottom_pattern_0
|
||||
connect_skin_polygons
|
||||
skin_angles
|
||||
wall_0_inset
|
||||
optimize_wall_printing_order
|
||||
outer_inset_first
|
||||
|
|
@ -58,6 +47,19 @@ z_seam_x
|
|||
z_seam_y
|
||||
z_seam_corner
|
||||
z_seam_relative
|
||||
|
||||
[top_bottom]
|
||||
roofing_layer_count
|
||||
top_bottom_extruder_nr
|
||||
top_bottom_thickness
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
top_bottom_pattern
|
||||
top_bottom_pattern_0
|
||||
connect_skin_polygons
|
||||
skin_angles
|
||||
skin_no_small_gaps_heuristic
|
||||
skin_outline_count
|
||||
ironing_enabled
|
||||
|
|
|
|||
7
resources/themes/cura-light/icons/category_topbottom.svg
Normal file
7
resources/themes/cura-light/icons/category_topbottom.svg
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
|
||||
<g stroke-width="1" stroke="black">
|
||||
<polygon fill="none" points="6.5,3.5 9.5,11 3.5,26.5 26.5,26.5 20.5,11 23.5,3.5" />
|
||||
<line x1="7.5" y1="6" x2="22.5" y2="6" />
|
||||
<line x1="4.5" y1="24" x2="25.5" y2="24" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 310 B |
|
|
@ -73,7 +73,7 @@ def main():
|
|||
|
||||
for i, returncode in enumerate(pool.imap(partial(call, shell=True), commands)):
|
||||
if returncode != 0:
|
||||
print("\nCommand %s failed checking. :(" % commands[i])
|
||||
print("\nCommand {command} failed checking (code {errcode}). :(".format(command = commands[i], errcode = returncode))
|
||||
success_code = 1
|
||||
if success_code:
|
||||
print("MYPY check was completed, but did not pass")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue