From ebcdcb49871798086036d4b93e5e1922dbe78de0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 12 Feb 2019 14:00:16 +0100 Subject: Remove layer_height from um2+ extruder profiles. I've also doublechecked if the type of these profiles matches up and updated them where needed. --- resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg | 1 - resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg | 1 - resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg | 1 - resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg | 1 - resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg | 3 +-- resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg | 3 +-- .../um2p_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../um2p_global_Slightly_Coarse_Quality.inst.cfg | 14 ++++++++++++++ .../quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg | 1 - .../ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg | 3 +-- .../quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg | 1 - .../quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg | 1 - 49 files changed, 39 insertions(+), 72 deletions(-) create mode 100644 resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index d27a136765..ec9654c689 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -15,7 +15,6 @@ variant = 0.25 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 22 -layer_height = 0.06 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 top_bottom_thickness = 0.72 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg index 5bc62e5fd0..15c026eddb 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg @@ -15,7 +15,6 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 18 -layer_height = 0.15 speed_layer_0 = =round(speed_print * 30 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index 2847ab8c15..fac84dd65a 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -15,7 +15,6 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 22 -layer_height = 0.06 speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index 009fcf7877..7c6394dbfd 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -15,7 +15,6 @@ variant = 0.4 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 -layer_height = 0.1 speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index 7c492f2ec0..761227b250 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_pla variant = 0.6 mm @@ -15,7 +15,6 @@ variant = 0.6 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 -layer_height = 0.15 speed_layer_0 = =round(speed_print * 30 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 20 / 55) diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index 1b6cee0e1d..eee957ca30 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = draft weight = -1 material = generic_pla variant = 0.8 mm @@ -15,7 +15,6 @@ variant = 0.8 mm cool_min_layer_time = 5 cool_min_speed = 10 infill_sparse_density = 20 -layer_height = 0.2 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 speed_wall_0 = =math.ceil(speed_print * 25 / 40) diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index f55567f986..0de90e1536 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 22 -layer_height = 0.06 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 top_bottom_thickness = 0.72 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg index 63904632dc..000af3e5ae 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 18 -layer_height = 0.15 speed_layer_0 = =round(speed_print * 30 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index f76efeb7b2..7910ed350d 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 22 -layer_height = 0.06 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index fd7dfc86a7..cf748f96f3 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -layer_height = 0.1 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index aba3222412..ef740a7aad 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_abs variant = 0.6 mm @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 20 infill_sparse_density = 20 -layer_height = 0.15 speed_infill = =math.ceil(speed_print * 55 / 40) speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index 23618e2e1d..b92bb1342e 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = draft weight = -1 material = generic_abs variant = 0.8 mm @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 15 infill_sparse_density = 20 -layer_height = 0.2 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index c0434aca4f..778a6038ba 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 2 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 22 -layer_height = 0.06 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 top_bottom_thickness = 0.72 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg index 2dc076b012..ecfeab0201 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 18 -layer_height = 0.15 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_travel = 150 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index 300d5242e2..01b39b2589 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 2 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 22 -layer_height = 0.06 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index 17a9f1a579..d8e3d4ae1b 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -layer_height = 0.1 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index 6807a1a86a..a7354ef0f2 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_cpe variant = 0.6 mm @@ -17,7 +17,6 @@ cool_min_layer_time = 5 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 8 infill_sparse_density = 20 -layer_height = 0.15 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index 7a15ed53ec..0e71ca15e1 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = draft weight = -1 material = generic_cpe variant = 0.8 mm @@ -17,7 +17,6 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 8 infill_sparse_density = 20 -layer_height = 0.2 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index cc68478dd8..bdd8302068 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 -layer_height = 0.2 line_width = 0.38 raft_airgap = 0.37 raft_base_line_spacing = 1.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 0d0e0e2043..32f740e976 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_cpe_plus variant = 0.4 mm @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 -layer_height = 0.15 line_width = 0.38 raft_airgap = 0.37 raft_base_line_spacing = 1.6 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index e08a7fc357..5e76276624 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = draft +quality_type = slightlycoarse weight = -2 material = generic_cpe_plus variant = 0.6 mm @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -layer_height = 0.3 line_width = 0.57 raft_airgap = 0.37 raft_base_line_spacing = 2.4 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index 7c8589f09e..ff742e4028 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = draft weight = 0 material = generic_cpe_plus variant = 0.6 mm @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -layer_height = 0.22 line_width = 0.57 raft_airgap = 0.37 raft_base_line_spacing = 2.4 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index 1c42d28128..0d2f26a3f1 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = draft +quality_type = slightlycoarse weight = -2 material = generic_cpe_plus variant = 0.8 mm @@ -20,7 +20,6 @@ cool_min_layer_time = 3 infill_overlap = 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 -layer_height = 0.3 raft_airgap = 0.37 raft_base_line_width = 1.6 raft_interface_line_spacing = 1.8 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index 072081e092..6f97214be5 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = draft weight = 0 material = generic_cpe_plus variant = 0.8 mm @@ -20,7 +20,6 @@ cool_min_layer_time = 3 infill_overlap = 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 -layer_height = 0.2 raft_airgap = 0.37 raft_base_line_width = 1.6 raft_interface_line_spacing = 1.8 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index e5338c0e34..a6653d9d45 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = extra coarse +quality_type = extracoarse weight = -3 global_quality = True diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg new file mode 100644 index 0000000000..35dbbeedd7 --- /dev/null +++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Coarse Quality +definition = ultimaker2_plus + +[metadata] +setting_version = 6 +type = quality +quality_type = slightlycoarse +weight = -4 +global_quality = True + +[values] +layer_height = 0.3 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 512f9e499b..580a48ad0c 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 25 layer_0_z_overlap = 0.1 -layer_height = 0.06 raft_airgap = 0.15 raft_base_line_width = 0.5 raft_interface_line_spacing = 0.7 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index ce607f7a83..a759309d66 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 25 layer_0_z_overlap = 0.1 -layer_height = 0.1 raft_airgap = 0.15 raft_base_line_width = 0.5 raft_interface_line_spacing = 0.7 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index 7b06d5205c..ad36eb6144 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = draft weight = -1 material = generic_nylon variant = 0.4 mm @@ -19,7 +19,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 -layer_height = 0.2 raft_airgap = 0.57 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index b65f694e11..b6c01b2b04 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_nylon variant = 0.4 mm @@ -19,7 +19,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 -layer_height = 0.15 raft_airgap = 0.57 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 6caa1d2e82..39a8fc9973 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = slightlycoarse weight = -1 material = generic_nylon variant = 0.6 mm @@ -19,7 +19,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -layer_height = 0.3 raft_airgap = 0.44 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index 3dad97297f..d7b4bed1b4 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_nylon variant = 0.6 mm @@ -19,7 +19,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -layer_height = 0.15 raft_airgap = 0.44 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index fe5749aeff..735ff99afd 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = draft +quality_type = slightlycoarse weight = -2 material = generic_nylon variant = 0.8 mm @@ -19,7 +19,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 40 layer_0_z_overlap = 0.25 -layer_height = 0.3 raft_airgap = 0.44 raft_base_line_width = 1.6 raft_interface_line_spacing = 1.8 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index 3e16229ad1..6fae135eeb 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = draft weight = 0 material = generic_nylon variant = 0.8 mm @@ -19,7 +19,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 40 layer_0_z_overlap = 0.25 -layer_height = 0.2 raft_airgap = 0.44 raft_base_line_width = 1.6 raft_interface_line_spacing = 1.8 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index 0195a6170f..cd43abaca1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 25 layer_0_z_overlap = 0.2 -layer_height = 0.06 raft_airgap = 0.25 raft_base_line_spacing = 1 raft_base_line_width = 0.5 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index fe15f050c7..419310adda 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -21,7 +21,6 @@ cool_min_speed = 15 infill_overlap = 5 infill_sparse_density = 25 layer_0_z_overlap = 0.2 -layer_height = 0.1 raft_airgap = 0.25 raft_base_line_spacing = 1 raft_base_line_width = 0.5 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 1268e4f5a5..c089bbea33 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = draft weight = -1 material = generic_pc variant = 0.4 mm @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 30 layer_0_z_overlap = 0.3 -layer_height = 0.2 raft_airgap = 0.35 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index 31a55131bd..a476add495 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 30 layer_0_z_overlap = 0.3 -layer_height = 0.1 raft_airgap = 0.35 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index a4b0e7865e..48918392e0 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = slightlycoarse weight = -1 material = generic_pc variant = 0.6 mm @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -layer_height = 0.3 raft_airgap = 0.52 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index 9fef7be2f8..47d1e82cfe 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = fast weight = 0 material = generic_pc variant = 0.6 mm @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -layer_height = 0.15 raft_airgap = 0.52 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index cfbd0795ab..c434f31a7e 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = draft +quality_type = extracoarse weight = -2 material = generic_pc variant = 0.8 mm @@ -20,7 +20,6 @@ cool_min_layer_time = 3 infill_overlap = 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 -layer_height = 0.5 raft_airgap = 0.47 raft_base_line_width = 1.6 raft_interface_line_spacing = 1.8 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index fd24f29c40..fdf15e6708 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = normal +quality_type = draft weight = 0 material = generic_pc variant = 0.8 mm @@ -20,7 +20,6 @@ cool_min_layer_time = 3 infill_overlap = 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 -layer_height = 0.2 raft_airgap = 0.47 raft_base_line_width = 1.6 raft_interface_line_spacing = 1.8 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 8e320bef25..bc22bdcdea 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg @@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -layer_height = 0.15 line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index aee8437e39..0f93e1722f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -layer_height = 0.2 line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg index f1e709495b..ad9bc82810 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg @@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -layer_height = 0.15 line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index a3170f49d6..013cfd18f4 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = fast +quality_type = draft weight = -2 material = generic_pp variant = 0.8 mm @@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -layer_height = 0.2 line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg index eaa18ad931..5fbc51a1b0 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] setting_version = 6 type = quality -quality_type = draft +quality_type = slightlycoarse weight = -3 material = generic_pp variant = 0.8 mm @@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -layer_height = 0.3 line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 47bf078c2f..8ae6bdee77 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -20,7 +20,6 @@ cool_min_layer_time = 7 cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.1 -layer_height = 0.06 raft_airgap = 0.2 raft_base_line_spacing = 1 raft_interface_line_spacing = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 1983878a79..cef0fcabbe 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -19,7 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60 cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.12 -layer_height = 0.12 line_width = 0.57 raft_airgap = 0.24 raft_base_line_spacing = 1.2 -- cgit v1.2.3 From a24dc00bc570c796535830da2eb56b44b3df6bf9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 12 Feb 2019 18:08:17 +0100 Subject: Arrange child-nodes (like blocker) with parents. [CURA-6120] --- cura/Arranging/ArrangeObjectsJob.py | 11 +++++++++-- cura/Arranging/ShapeArray.py | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py index ce11556b5b..3ec548dbb3 100644 --- a/cura/Arranging/ArrangeObjectsJob.py +++ b/cura/Arranging/ArrangeObjectsJob.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Application import Application @@ -39,10 +39,17 @@ class ArrangeObjectsJob(Job): arranger = Arrange.create(x = machine_width, y = machine_depth, fixed_nodes = self._fixed_nodes, min_offset = self._min_offset) + # Build set to exclude children (those get arranged together with the parents). + included_as_child = set([]) + for node in self._nodes: + included_as_child.update(node.getAllChildren()) + # Collect nodes to be placed nodes_arr = [] # fill with (size, node, offset_shape_arr, hull_shape_arr) for node in self._nodes: - offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = self._min_offset) + if node in included_as_child: + continue + offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = self._min_offset, include_children = True) if offset_shape_arr is None: Logger.log("w", "Node [%s] could not be converted to an array for arranging...", str(node)) continue diff --git a/cura/Arranging/ShapeArray.py b/cura/Arranging/ShapeArray.py index ab785cc3e1..64b78d6f17 100644 --- a/cura/Arranging/ShapeArray.py +++ b/cura/Arranging/ShapeArray.py @@ -42,7 +42,7 @@ class ShapeArray: # \param min_offset offset for the offset ShapeArray # \param scale scale the coordinates @classmethod - def fromNode(cls, node, min_offset, scale = 0.5): + def fromNode(cls, node, min_offset, scale = 0.5, include_children = False): transform = node._transformation transform_x = transform._data[0][3] transform_y = transform._data[2][3] @@ -52,6 +52,21 @@ class ShapeArray: return None, None # For one_at_a_time printing you need the convex hull head. hull_head_verts = node.callDecoration("getConvexHullHead") or hull_verts + if hull_head_verts is None: + hull_head_verts = Polygon() + + # If the child-nodes are included, adjust convex hulls as well: + if include_children: + children = node.getAllChildren() + if not children is None: + for child in children: + # 'Inefficient' combination of convex hulls through known code rather than mess it up: + child_hull = child.callDecoration("getConvexHull") + if not child_hull is None: + hull_verts = hull_verts.unionConvexHulls(child_hull) + child_hull_head = child.callDecoration("getConvexHullHead") or child_hull + if not child_hull_head is None: + hull_head_verts = hull_head_verts.unionConvexHulls(child_hull_head) offset_verts = hull_head_verts.getMinkowskiHull(Polygon.approximatedCircle(min_offset)) offset_points = copy.deepcopy(offset_verts._points) # x, y -- cgit v1.2.3 From 0e329946f80d7f39f0985d6f6e0f11664c3895d2 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 14 Feb 2019 11:05:13 +0100 Subject: Small refactor (init set plain instead of with empty list). [CURA-6120] --- cura/Arranging/ArrangeObjectsJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py index 3ec548dbb3..aef051c838 100644 --- a/cura/Arranging/ArrangeObjectsJob.py +++ b/cura/Arranging/ArrangeObjectsJob.py @@ -40,7 +40,7 @@ class ArrangeObjectsJob(Job): arranger = Arrange.create(x = machine_width, y = machine_depth, fixed_nodes = self._fixed_nodes, min_offset = self._min_offset) # Build set to exclude children (those get arranged together with the parents). - included_as_child = set([]) + included_as_child = set() for node in self._nodes: included_as_child.update(node.getAllChildren()) -- cgit v1.2.3 From 0275de7f77665644f1d7dc3710cee598b55e04ab Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 14 Feb 2019 11:46:41 +0100 Subject: Make sure to set the build plate so it's not empty Contributes to CL-1250 --- plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index a8165ff69c..b641b48235 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -55,6 +55,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): # \param controller - The controller of the model. def createOutputModel(self, controller: PrinterOutputController) -> PrinterOutputModel: model = PrinterOutputModel(controller, len(self.configuration), firmware_version = self.firmware_version) + model.updateBuildplateName(self.build_plate.type) self.updateOutputModel(model) return model -- cgit v1.2.3 From af565aff551e812a11ec40b7eda05790a213b632 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 14 Feb 2019 11:49:43 +0100 Subject: Clarify if using key or human-readable name This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name. Contributes to CL-1250 --- cura/PrinterOutput/PrinterOutputModel.py | 12 ++++++------ .../src/Cloud/Models/CloudClusterPrinterStatus.py | 2 +- plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cura/PrinterOutput/PrinterOutputModel.py b/cura/PrinterOutput/PrinterOutputModel.py index 4189b9fcbd..e5f06c832c 100644 --- a/cura/PrinterOutput/PrinterOutputModel.py +++ b/cura/PrinterOutput/PrinterOutputModel.py @@ -44,7 +44,7 @@ class PrinterOutputModel(QObject): self._printer_state = "unknown" self._is_preheating = False self._printer_type = "" - self._buildplate_name = "" + self._buildplate = "" self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in self._extruders] @@ -86,12 +86,12 @@ class PrinterOutputModel(QObject): @pyqtProperty(str, notify = buildplateChanged) def buildplate(self) -> str: - return self._buildplate_name + return self._buildplate - def updateBuildplateName(self, buildplate_name: str) -> None: - if self._buildplate_name != buildplate_name: - self._buildplate_name = buildplate_name - self._printer_configuration.buildplateConfiguration = self._buildplate_name + def updateBuildplate(self, buildplate_name: str) -> None: + if self._buildplate != buildplate_name: + self._buildplate = buildplate_name + self._printer_configuration.buildplateConfiguration = self._buildplate self.buildplateChanged.emit() self.configurationChanged.emit() diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index b641b48235..261ab4b389 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -55,7 +55,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): # \param controller - The controller of the model. def createOutputModel(self, controller: PrinterOutputController) -> PrinterOutputModel: model = PrinterOutputModel(controller, len(self.configuration), firmware_version = self.firmware_version) - model.updateBuildplateName(self.build_plate.type) + model.updateBuildplate(self.build_plate.type) self.updateOutputModel(model) return model diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py index 790d0c430b..4bbb7ddb5f 100644 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py @@ -627,7 +627,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): # Do not store the build plate information that comes from connect if the current printer has not build plate information if "build_plate" in data and machine_definition.getMetaDataEntry("has_variant_buildplates", False): - printer.updateBuildplateName(data["build_plate"]["type"]) + printer.updateBuildplate(data["build_plate"]["type"]) if not data["enabled"]: printer.updateState("disabled") else: -- cgit v1.2.3 From 10f84184f34fda5d83ef3fa123df0c77e05825e9 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 14 Feb 2019 11:57:47 +0100 Subject: Continued clarification on "name" Contributes to CL-1250 --- cura/PrinterOutput/PrinterOutputModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/PrinterOutputModel.py b/cura/PrinterOutput/PrinterOutputModel.py index e5f06c832c..ea8fca5bac 100644 --- a/cura/PrinterOutput/PrinterOutputModel.py +++ b/cura/PrinterOutput/PrinterOutputModel.py @@ -88,9 +88,9 @@ class PrinterOutputModel(QObject): def buildplate(self) -> str: return self._buildplate - def updateBuildplate(self, buildplate_name: str) -> None: - if self._buildplate != buildplate_name: - self._buildplate = buildplate_name + def updateBuildplate(self, buildplate: str) -> None: + if self._buildplate != buildplate: + self._buildplate = buildplate self._printer_configuration.buildplateConfiguration = self._buildplate self.buildplateChanged.emit() self.configurationChanged.emit() -- cgit v1.2.3 From b09538da63b2639a4f03d8703adeb2d84d30399e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 14 Feb 2019 13:44:43 +0100 Subject: Ensure that the numberOfExtruders property gets updated after configuration sync CURA-6220 --- cura/Settings/MachineManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7511fcd109..4bdcc022df 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1438,6 +1438,8 @@ class MachineManager(QObject): self._global_container_stack.extruders[position].setEnabled(True) self.updateMaterialWithVariant(position) + self.updateNumberExtrudersEnabled() + if configuration.buildplateConfiguration is not None: global_variant_container_node = self._variant_manager.getBuildplateVariantNode(self._global_container_stack.definition.getId(), configuration.buildplateConfiguration) if global_variant_container_node: -- cgit v1.2.3 From 6ff1f49c347b69e9b280441e4d4bef1698108ea1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 14 Feb 2019 17:21:54 +0100 Subject: Ensure the layout gets the right width & height for the output devices popup CURA-6222 --- resources/qml/ActionPanel/OutputDevicesActionButton.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml index 3bfaab0fc1..866b8cc627 100644 --- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml +++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml @@ -90,6 +90,10 @@ Item cornerRadius: 0 hoverColor: UM.Theme.getColor("primary") Layout.fillWidth: true + // The total width of the popup should be defined by the largest button. By stating that each + // button should be minimally the size of it's content (aka; implicitWidth) we can ensure that. + Layout.minimumWidth: implicitWidth + Layout.preferredHeight: widget.height onClicked: { UM.OutputDeviceManager.setActiveDevice(model.id) -- cgit v1.2.3 From 72ce40deba79b498cec694cac65087e3f3a139b3 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 15 Feb 2019 09:36:38 +0100 Subject: Update buildplate with other props Contributes to CL-1250 --- .../UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index 261ab4b389..80c5fc72fc 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -55,7 +55,6 @@ class CloudClusterPrinterStatus(BaseCloudModel): # \param controller - The controller of the model. def createOutputModel(self, controller: PrinterOutputController) -> PrinterOutputModel: model = PrinterOutputModel(controller, len(self.configuration), firmware_version = self.firmware_version) - model.updateBuildplate(self.build_plate.type) self.updateOutputModel(model) return model @@ -66,6 +65,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateName(self.friendly_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") + model.updateBuildplate(self.build_plate.type) for configuration, extruder_output, extruder_config in \ zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): -- cgit v1.2.3 From 5d294a7ff50f88485ad6f51f106a1f79c4ccfc7f Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 15 Feb 2019 10:04:39 +0100 Subject: Handle self.build_plate = None Contributes to CL-1250 --- .../src/Cloud/Models/CloudClusterPrinterStatus.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index 80c5fc72fc..96310b8229 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -65,7 +65,13 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateName(self.friendly_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") - model.updateBuildplate(self.build_plate.type) + + # Make sure to set the build plate even though we don't use it. Since it's optional, use + # glass as a default + if self.build_plate: + model.updateBuildplate(self.build_plate.type) + else: + model.updateBuildplate("glass") for configuration, extruder_output, extruder_config in \ zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): -- cgit v1.2.3 From 0be6c9e6d37dad83b7c447bffd439a6a2b2bb1e4 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 15 Feb 2019 10:10:39 +0100 Subject: Expect to always have a build plate Contributes to CL-1250 --- .../src/Cloud/Models/CloudClusterPrinterStatus.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index 96310b8229..78bf0013f1 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -48,7 +48,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): self.maintenance_required = maintenance_required self.firmware_update_status = firmware_update_status self.latest_available_firmware = latest_available_firmware - self.build_plate = self.parseModel(CloudClusterBuildPlate, build_plate) if build_plate else None + self.build_plate = self.parseModel(CloudClusterBuildPlate, build_plate) super().__init__(**kwargs) ## Creates a new output model. @@ -65,13 +65,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateName(self.friendly_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") - - # Make sure to set the build plate even though we don't use it. Since it's optional, use - # glass as a default - if self.build_plate: - model.updateBuildplate(self.build_plate.type) - else: - model.updateBuildplate("glass") + model.updateBuildplate(self.build_plate.type) for configuration, extruder_output, extruder_config in \ zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): -- cgit v1.2.3 From 4feb53fdf485b7932e9749297dbf6c866d196c63 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 15 Feb 2019 10:12:19 +0100 Subject: Revert "Expect to always have a build plate" This reverts commit 0be6c9e6d37dad83b7c447bffd439a6a2b2bb1e4. --- .../src/Cloud/Models/CloudClusterPrinterStatus.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index 78bf0013f1..96310b8229 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -48,7 +48,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): self.maintenance_required = maintenance_required self.firmware_update_status = firmware_update_status self.latest_available_firmware = latest_available_firmware - self.build_plate = self.parseModel(CloudClusterBuildPlate, build_plate) + self.build_plate = self.parseModel(CloudClusterBuildPlate, build_plate) if build_plate else None super().__init__(**kwargs) ## Creates a new output model. @@ -65,7 +65,13 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateName(self.friendly_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") - model.updateBuildplate(self.build_plate.type) + + # Make sure to set the build plate even though we don't use it. Since it's optional, use + # glass as a default + if self.build_plate: + model.updateBuildplate(self.build_plate.type) + else: + model.updateBuildplate("glass") for configuration, extruder_output, extruder_config in \ zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): -- cgit v1.2.3 From f7d86667ed81ffd252889802516ed26ad0e220f1 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 15 Feb 2019 10:14:14 +0100 Subject: Simplify code a bit Contributes to CL-1250 --- .../src/Cloud/Models/CloudClusterPrinterStatus.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index 96310b8229..6193fd0c26 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -65,13 +65,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateName(self.friendly_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") - - # Make sure to set the build plate even though we don't use it. Since it's optional, use - # glass as a default - if self.build_plate: - model.updateBuildplate(self.build_plate.type) - else: - model.updateBuildplate("glass") + model.updateBuildplate(self.build_plate.type or "glass") for configuration, extruder_output, extruder_config in \ zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): -- cgit v1.2.3 From 0a945b8ba5fc726a7695826ea58624cab8948f28 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 15 Feb 2019 10:18:47 +0100 Subject: Code style Contributes to CL-1250 --- .../UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py index 6193fd0c26..bd3e482bde 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py @@ -65,7 +65,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateName(self.friendly_name) model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") - model.updateBuildplate(self.build_plate.type or "glass") + model.updateBuildplate(self.build_plate.type if self.build_plate else "glass") for configuration, extruder_output, extruder_config in \ zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): -- cgit v1.2.3 From 21099e30cb666d65b53fbcd749793ce6f5fe6776 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 15 Feb 2019 12:51:40 +0100 Subject: Check if on main thread for call_on_qt_thread CURA-6225 --- cura/Utils/Threading.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cura/Utils/Threading.py b/cura/Utils/Threading.py index 3cd6200513..c57a452b72 100644 --- a/cura/Utils/Threading.py +++ b/cura/Utils/Threading.py @@ -31,4 +31,10 @@ def call_on_qt_thread(func): CuraApplication.getInstance().callLater(_handle_call, *new_args, **kwargs) inter_call_object.finish_event.wait() return inter_call_object.result + + # If the current thread is the main thread, which is the Qt thread, directly return the function. + current_thread = threading.current_thread() + if isinstance(current_thread, threading._MainThread): + return func + return _call_on_qt_thread_wrapper -- cgit v1.2.3 From 2d1d0c2d374726ccb352512bc1dc67b3bd3f8619 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 15 Feb 2019 13:39:40 +0100 Subject: Remove unused image --- resources/qml/Account/AvatarImage.qml | 1 - .../themes/cura-light/images/avatar_default.svg | 76 ---------------------- 2 files changed, 77 deletions(-) delete mode 100644 resources/themes/cura-light/images/avatar_default.svg diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml index bcbc9f0542..a4f922a10d 100644 --- a/resources/qml/Account/AvatarImage.qml +++ b/resources/qml/Account/AvatarImage.qml @@ -22,7 +22,6 @@ Item { id: profileImage anchors.fill: parent - source: UM.Theme.getImage("avatar_default") fillMode: Image.PreserveAspectCrop visible: false mipmap: true diff --git a/resources/themes/cura-light/images/avatar_default.svg b/resources/themes/cura-light/images/avatar_default.svg deleted file mode 100644 index 7ec704bc8c..0000000000 --- a/resources/themes/cura-light/images/avatar_default.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - -- cgit v1.2.3 From f3cab17e2001cc5d372f643d85f627fc3b85cec2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 15 Feb 2019 13:44:06 +0100 Subject: Revert "Check if on main thread for call_on_qt_thread" This reverts commit 21099e30cb666d65b53fbcd749793ce6f5fe6776. It was causing a segfault when saving UFP files. --- cura/Utils/Threading.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cura/Utils/Threading.py b/cura/Utils/Threading.py index c57a452b72..3cd6200513 100644 --- a/cura/Utils/Threading.py +++ b/cura/Utils/Threading.py @@ -31,10 +31,4 @@ def call_on_qt_thread(func): CuraApplication.getInstance().callLater(_handle_call, *new_args, **kwargs) inter_call_object.finish_event.wait() return inter_call_object.result - - # If the current thread is the main thread, which is the Qt thread, directly return the function. - current_thread = threading.current_thread() - if isinstance(current_thread, threading._MainThread): - return func - return _call_on_qt_thread_wrapper -- cgit v1.2.3