mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-11 16:00:47 -07:00
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
This commit is contained in:
commit
5a6e84a57f
26 changed files with 162 additions and 73 deletions
|
|
@ -6,9 +6,7 @@
|
|||
"visible": true,
|
||||
"author": "ABAX 3d Technologies",
|
||||
"manufacturer": "ABAX 3d Technologies",
|
||||
"file_formats": "text/x-gcode",
|
||||
"quality_definition": "abax_pri3",
|
||||
"has_machine_quality": true
|
||||
"file_formats": "text/x-gcode"
|
||||
},
|
||||
"overrides": {
|
||||
"machine_start_gcode": {
|
||||
|
|
|
|||
|
|
@ -519,6 +519,9 @@ UM.MainWindow
|
|||
|
||||
insertPage(4, catalog.i18nc("@title:tab", "Profiles"), Qt.resolvedUrl("Preferences/ProfilesPage.qml"));
|
||||
|
||||
// Remove plug-ins page because we will use the shiny new plugin browser:
|
||||
removePage(5);
|
||||
|
||||
//Force refresh
|
||||
setPage(0);
|
||||
}
|
||||
|
|
@ -630,17 +633,6 @@ UM.MainWindow
|
|||
}
|
||||
}
|
||||
|
||||
// show the installed plugins page in the preferences dialog
|
||||
Connections
|
||||
{
|
||||
target: Cura.Actions.configurePlugins
|
||||
onTriggered:
|
||||
{
|
||||
preferences.visible = true
|
||||
preferences.setPage(5)
|
||||
}
|
||||
}
|
||||
|
||||
UM.ExtensionModel {
|
||||
id: curaExtensions
|
||||
}
|
||||
|
|
|
|||
22
resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
Normal file
22
resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = abax_pri5
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = -1
|
||||
material = generic_pla
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.8
|
||||
infill_sparse_density = 20
|
||||
speed_print = 80
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/abax_pri5/apri5_pla_high.inst.cfg
Normal file
22
resources/quality/abax_pri5/apri5_pla_high.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Extra Fine
|
||||
definition = abax_pri5
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
material = generic_pla
|
||||
|
||||
[values]
|
||||
layer_height = 0.1
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.8
|
||||
infill_sparse_density = 20
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
Normal file
22
resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = abax_pri5
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
material = generic_pla
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.8
|
||||
infill_sparse_density = 20
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -12,7 +12,6 @@ material = generic_petg
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.3
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_bed_temperature = 50
|
||||
material_bed_temperature_layer_0 = 55
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_petg
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.3
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_bed_temperature = 50
|
||||
material_bed_temperature_layer_0 = 55
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_petg
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_bed_temperature = 50
|
||||
material_bed_temperature_layer_0 = 55
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_petg
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_bed_temperature = 50
|
||||
material_bed_temperature_layer_0 = 55
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.3
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
meshfix_union_all = False
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.3
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
meshfix_union_all = False
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
material_print_temperature = 205
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
material_print_temperature = 205
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
meshfix_union_all = False
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
meshfix_union_all = False
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
@ -27,8 +26,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.05
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
material_print_temperature = 202
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@ infill_line_width = 0.6
|
|||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 20
|
||||
layer_height = 0.05
|
||||
layer_height_0 = 0.3
|
||||
line_width = 0.4
|
||||
material_flow = 90
|
||||
material_print_temperature = 202
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Coarse
|
||||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
layer_height = 0.3
|
||||
layer_height_0 = 0.3
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.3
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Medium
|
||||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.3
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = UltraFine
|
||||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = ultrahigh
|
||||
weight = 2
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
layer_height = 0.05
|
||||
layer_height_0 = 0.3
|
||||
Loading…
Add table
Add a link
Reference in a new issue