mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-15 21:15:52 +08:00
Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura
This commit is contained in:
Jaime van Kessel
commit
20357dabb3
@ -963,20 +963,20 @@
|
|||||||
"maximum_value_warning": "2 * machine_nozzle_size",
|
"maximum_value_warning": "2 * machine_nozzle_size",
|
||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
"settable_per_extruder": true
|
"settable_per_extruder": true
|
||||||
},
|
|
||||||
"initial_layer_line_width_factor":
|
|
||||||
{
|
|
||||||
"label": "Initial Layer Line Width",
|
|
||||||
"description": "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion.",
|
|
||||||
"type": "float",
|
|
||||||
"unit": "%",
|
|
||||||
"default_value": 100.0,
|
|
||||||
"minimum_value": "0.001",
|
|
||||||
"maximum_value_warning": "150",
|
|
||||||
"settable_per_mesh": false,
|
|
||||||
"settable_per_extruder": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"initial_layer_line_width_factor":
|
||||||
|
{
|
||||||
|
"label": "Initial Layer Line Width",
|
||||||
|
"description": "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion.",
|
||||||
|
"type": "float",
|
||||||
|
"unit": "%",
|
||||||
|
"default_value": 100.0,
|
||||||
|
"minimum_value": "0.001",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -2346,7 +2346,195 @@
|
|||||||
"minimum_value_warning": "50",
|
"minimum_value_warning": "50",
|
||||||
"maximum_value_warning": "150",
|
"maximum_value_warning": "150",
|
||||||
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
|
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
|
||||||
"settable_per_mesh": true
|
"settable_per_mesh": true,
|
||||||
|
"children":
|
||||||
|
{
|
||||||
|
"wall_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Wall Flow",
|
||||||
|
"description": "Flow compensation on wall lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"limit_to_extruder": "wall_0_extruder_nr if wall_x_extruder_nr == wall_0_extruder_nr else -1",
|
||||||
|
"settable_per_mesh": true,
|
||||||
|
"children":
|
||||||
|
{
|
||||||
|
"wall_0_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Outer Wall Flow",
|
||||||
|
"description": "Flow compensation on the outermost wall line.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "wall_material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"limit_to_extruder": "wall_0_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
|
},
|
||||||
|
"wall_x_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Inner Wall(s) Flow",
|
||||||
|
"description": "Flow compensation on wall lines for all wall lines except the outermost one.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "wall_material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"limit_to_extruder": "wall_x_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"skin_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Top/Bottom Flow",
|
||||||
|
"description": "Flow compensation on top/bottom lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||||
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
|
},
|
||||||
|
"roofing_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Top Surface Skin Flow",
|
||||||
|
"description": "Flow compensation on lines of the areas at the top of the print.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "skin_material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"limit_to_extruder": "roofing_extruder_nr",
|
||||||
|
"settable_per_mesh": true,
|
||||||
|
"enabled": "roofing_layer_count > 0 and top_layers > 0"
|
||||||
|
},
|
||||||
|
"infill_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Infill Flow",
|
||||||
|
"description": "Flow compensation on infill lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"enabled": "infill_sparse_density > 0",
|
||||||
|
"limit_to_extruder": "infill_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
|
},
|
||||||
|
"skirt_brim_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Skirt/Brim Flow",
|
||||||
|
"description": "Flow compensation on skirt or brim lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim'",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true
|
||||||
|
},
|
||||||
|
"support_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Support Flow",
|
||||||
|
"description": "Flow compensation on support structure lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"limit_to_extruder": "support_infill_extruder_nr",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true
|
||||||
|
},
|
||||||
|
"support_interface_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Support Interface Flow",
|
||||||
|
"description": "Flow compensation on lines of support roof or floor.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"enabled": "support_enable and support_interface_enable",
|
||||||
|
"limit_to_extruder": "support_interface_extruder_nr",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true,
|
||||||
|
"children":
|
||||||
|
{
|
||||||
|
"support_roof_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Support Roof Flow",
|
||||||
|
"description": "Flow compensation on support roof lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_material_flow')",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"enabled": "support_enable and support_roof_enable",
|
||||||
|
"limit_to_extruder": "support_roof_extruder_nr",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true
|
||||||
|
},
|
||||||
|
"support_bottom_material_flow":
|
||||||
|
{
|
||||||
|
"label": "Support Floor Flow",
|
||||||
|
"description": "Flow compensation on support floor lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_material_flow')",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"enabled": "support_enable and support_bottom_enable",
|
||||||
|
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"prime_tower_flow":
|
||||||
|
{
|
||||||
|
"label": "Prime Tower Flow",
|
||||||
|
"description": "Flow compensation on prime tower lines.",
|
||||||
|
"unit": "%",
|
||||||
|
"type": "float",
|
||||||
|
"default_value": 100,
|
||||||
|
"value": "material_flow",
|
||||||
|
"minimum_value": "5",
|
||||||
|
"minimum_value_warning": "50",
|
||||||
|
"maximum_value_warning": "150",
|
||||||
|
"settable_per_mesh": false,
|
||||||
|
"settable_per_extruder": true
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"material_flow_layer_0":
|
"material_flow_layer_0":
|
||||||
{
|
{
|
||||||
@ -2354,7 +2542,6 @@
|
|||||||
"description": "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value.",
|
"description": "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value.",
|
||||||
"unit": "%",
|
"unit": "%",
|
||||||
"default_value": 100,
|
"default_value": 100,
|
||||||
"value": "material_flow",
|
|
||||||
"type": "float",
|
"type": "float",
|
||||||
"minimum_value": "0.0001",
|
"minimum_value": "0.0001",
|
||||||
"minimum_value_warning": "50",
|
"minimum_value_warning": "50",
|
||||||
@ -5439,21 +5626,6 @@
|
|||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
"settable_per_extruder": false
|
"settable_per_extruder": false
|
||||||
},
|
},
|
||||||
"prime_tower_flow":
|
|
||||||
{
|
|
||||||
"label": "Prime Tower Flow",
|
|
||||||
"description": "Flow compensation: the amount of material extruded is multiplied by this value.",
|
|
||||||
"type": "float",
|
|
||||||
"unit": "%",
|
|
||||||
"enabled": "resolveOrValue('prime_tower_enable')",
|
|
||||||
"default_value": 100,
|
|
||||||
"value": "material_flow",
|
|
||||||
"minimum_value": "0.0001",
|
|
||||||
"minimum_value_warning": "50",
|
|
||||||
"maximum_value_warning": "150",
|
|
||||||
"settable_per_mesh": false,
|
|
||||||
"settable_per_extruder": true
|
|
||||||
},
|
|
||||||
"prime_tower_wipe_enabled":
|
"prime_tower_wipe_enabled":
|
||||||
{
|
{
|
||||||
"label": "Wipe Inactive Nozzle on Prime Tower",
|
"label": "Wipe Inactive Nozzle on Prime Tower",
|
||||||
|
|||||||
@ -113,6 +113,18 @@ material_bed_temperature_layer_0
|
|||||||
material_adhesion_tendency
|
material_adhesion_tendency
|
||||||
material_surface_energy
|
material_surface_energy
|
||||||
material_flow
|
material_flow
|
||||||
|
wall_material_flow
|
||||||
|
wall_0_material_flow
|
||||||
|
wall_x_material_flow
|
||||||
|
skin_material_flow
|
||||||
|
roofing_material_flow
|
||||||
|
infill_material_flow
|
||||||
|
skirt_brim_material_flow
|
||||||
|
support_material_flow
|
||||||
|
support_interface_material_flow
|
||||||
|
support_roof_material_flow
|
||||||
|
support_bottom_material_flow
|
||||||
|
prime_tower_flow
|
||||||
material_flow_layer_0
|
material_flow_layer_0
|
||||||
retraction_enable
|
retraction_enable
|
||||||
retract_at_layer_change
|
retract_at_layer_change
|
||||||
@ -297,7 +309,6 @@ prime_tower_size
|
|||||||
prime_tower_min_volume
|
prime_tower_min_volume
|
||||||
prime_tower_position_x
|
prime_tower_position_x
|
||||||
prime_tower_position_y
|
prime_tower_position_y
|
||||||
prime_tower_flow
|
|
||||||
prime_tower_wipe_enabled
|
prime_tower_wipe_enabled
|
||||||
prime_tower_brim_enable
|
prime_tower_brim_enable
|
||||||
ooze_shield_enabled
|
ooze_shield_enabled
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user