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

Add new nominal_layer_height setting, and make UI use it.
Some checks failed
conan-package / conan-package (push) Failing after 0s
unit-test / Run unit tests (push) Failing after 0s
printer-linter-format / Printer linter auto format (push) Failing after 1s
conan-package-resources / conan-package (push) Failing after 1s

Browse Source
This commit is contained in:
Frederic98 2024-12-17 13:36:13 +01:00
parent 382b98e8b0
commit 2999b9dcf6
11 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/Machines/Models/MachineModelUtils.py
View File

@ -15,7 +15,7 @@ def fetchLayerHeight(quality_group: "QualityGroup") -> float:
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
global_stack = CuraApplication.getInstance().getMachineManager().activeMachine global_stack = CuraApplication.getInstance().getMachineManager().activeMachine
default_layer_height = global_stack.definition.getProperty("layer_height", "value") default_layer_height = global_stack.definition.getProperty("nominal_layer_height", "value")
# Get layer_height from the quality profile for the GlobalStack # Get layer_height from the quality profile for the GlobalStack
if quality_group.node_for_global is None: if quality_group.node_for_global is None:
@ -23,13 +23,13 @@ def fetchLayerHeight(quality_group: "QualityGroup") -> float:
container = quality_group.node_for_global.container container = quality_group.node_for_global.container
layer_height = default_layer_height layer_height = default_layer_height
if container and container.hasProperty("layer_height", "value"): if container and container.hasProperty("nominal_layer_height", "value"):
layer_height = container.getProperty("layer_height", "value") layer_height = container.getProperty("nominal_layer_height", "value")
else: else:
# Look for layer_height in the GlobalStack from material -> definition # Look for layer_height in the GlobalStack from material -> definition
container = global_stack.definition container = global_stack.definition
if container and container.hasProperty("layer_height", "value"): if container and container.hasProperty("nominal_layer_height", "value"):
layer_height = container.getProperty("layer_height", "value") layer_height = container.getProperty("nominal_layer_height", "value")
if isinstance(layer_height, SettingFunction): if isinstance(layer_height, SettingFunction):
layer_height = layer_height(global_stack) layer_height = layer_height(global_stack)

2
cura/Machines/Models/QualityProfilesDropDownMenuModel.py
View File

@ -71,7 +71,7 @@ class QualityProfilesDropDownMenuModel(ListModel):
return return
if not self._layer_height_unit: if not self._layer_height_unit:
unit = global_stack.definition.getProperty("layer_height", "unit") unit = global_stack.definition.getProperty("nominal_layer_height", "unit")
if not unit: if not unit:
unit = "" unit = ""
self._layer_height_unit = unit self._layer_height_unit = unit

2
cura/Settings/MachineManager.py
View File

@ -617,7 +617,7 @@ class MachineManager(QObject):
if not self._global_container_stack: if not self._global_container_stack:
return 0 return 0
value = self._global_container_stack.getRawProperty("layer_height", "value", skip_until_container = self._global_container_stack.qualityChanges.getId()) value = self._global_container_stack.getRawProperty("nominal_layer_height", "value", skip_until_container = self._global_container_stack.qualityChanges.getId())
if isinstance(value, SettingFunction): if isinstance(value, SettingFunction):
value = value(self._global_container_stack) value = value(self._global_container_stack)
return value return value

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

@ -798,10 +798,10 @@
"description": "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)", "description": "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)",
"children": "children":
{ {
"layer_height": "nominal_layer_height":
{ {
"label": "Layer Height", "label": "Nominal Layer Height",
"description": "The height of each layer in mm. Higher values produce faster prints in lower resolution, lower values produce slower prints in higher resolution.", "description": "The nominal layer height of the final printed part.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.1, "default_value": 0.1,
@ -809,21 +809,38 @@
"minimum_value_warning": "0.04", "minimum_value_warning": "0.04",
"maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))", "maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false,
}, "children":
"layer_height_0": {
{ "layer_height":
"label": "Initial Layer Height", {
"description": "The height of the initial layer in mm. A thicker initial layer makes adhesion to the build plate easier.", "label": "Layer Height",
"unit": "mm", "description": "The height of each layer in mm. Higher values produce faster prints in lower resolution, lower values produce slower prints in higher resolution.",
"type": "float", "unit": "mm",
"default_value": 0.3, "type": "float",
"resolve": "min(extruderValues('layer_height_0'))", "default_value": 0.1,
"minimum_value": "0.001", "value": "nominal_layer_height",
"minimum_value_warning": "0.1", "minimum_value": "0.001",
"maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))", "minimum_value_warning": "0.04",
"settable_per_mesh": false, "maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))",
"settable_per_extruder": false "settable_per_mesh": false,
"settable_per_extruder": false
},
"layer_height_0":
{
"label": "Initial Layer Height",
"description": "The height of the initial layer in mm. A thicker initial layer makes adhesion to the build plate easier.",
"unit": "mm",
"type": "float",
"default_value": 0.3,
"resolve": "min(extruderValues('layer_height_0'))",
"minimum_value": "0.001",
"minimum_value_warning": "0.1",
"maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))",
"settable_per_mesh": false,
"settable_per_extruder": false
}
}
}, },
"line_width": "line_width":
{ {

3
resources/definitions/ultimaker_factor4.def.json
View File

@ -105,7 +105,8 @@
"value": "5" "value": "5"
}, },
"jerk_travel_enabled": { "value": "True" }, "jerk_travel_enabled": { "value": "True" },
"layer_height": { "value": "min(min(extruderValues('machine_nozzle_size')) / 2, 0.2)" }, "nominal_layer_height": { "value": "min(min(extruderValues('machine_nozzle_size')) / 2, 0.2)" },
"layer_height": { "value": "round(nominal_layer_height * material_shrinkage_percentage_z / 100, 5)" },
"machine_acceleration": { "default_value": 3000 }, "machine_acceleration": { "default_value": 3000 },
"machine_depth": { "default_value": 240 }, "machine_depth": { "default_value": 240 },
"machine_end_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" },

2
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View File

@ -26,7 +26,7 @@ RowLayout
{ {
id: layerHeight id: layerHeight
containerStack: Cura.MachineManager.activeStack containerStack: Cura.MachineManager.activeStack
key: "layer_height" key: "nominal_layer_height"
watchedProperties: ["value"] watchedProperties: ["value"]
} }
} }

2
resources/quality/ultimaker_factor4/um_f4_global_Draft_Quality.inst.cfg
View File

@ -11,5 +11,5 @@ type = quality
weight = -2 weight = -2
[values] [values]
layer_height = =round(0.2 * material_shrinkage_percentage_z / 100, 5) nominal_layer_height = 0.2

2
resources/quality/ultimaker_factor4/um_f4_global_Fast_Quality.inst.cfg
View File

@ -11,5 +11,5 @@ type = quality
weight = -1 weight = -1
[values] [values]
layer_height = =round(0.15 * material_shrinkage_percentage_z / 100, 5) nominal_layer_height = 0.15

2
resources/quality/ultimaker_factor4/um_f4_global_Normal_Quality.inst.cfg
View File

@ -11,5 +11,5 @@ type = quality
weight = 0 weight = 0
[values] [values]
layer_height = =round(0.1 * material_shrinkage_percentage_z / 100, 5) nominal_layer_height = 0.1

2
resources/quality/ultimaker_factor4/um_f4_global_Superdraft_Quality.inst.cfg
View File

@ -11,5 +11,5 @@ type = quality
weight = -4 weight = -4
[values] [values]
layer_height = =round(0.4 * material_shrinkage_percentage_z / 100, 5) nominal_layer_height = 0.4

2
resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg
View File

@ -11,5 +11,5 @@ type = quality
weight = -3 weight = -3
[values] [values]
layer_height = =round(0.3 * material_shrinkage_percentage_z / 100, 5) nominal_layer_height = 0.3