From 088202c3667fe00b7e0c7380143cef41e1f220f4 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 27 Mar 2017 10:30:51 +0200 Subject: [PATCH 1/6] Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 --- ... => um3_aa0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...=> um3_aa0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_aa0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...g => um3_aa0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_aa0.8_PVA_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_aa0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.4_ABS_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...=> um3_bb0.4_CPEP_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.4_CPE_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...> um3_bb0.4_Nylon_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.4_PLA_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.4_TPU_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...=> um3_bb0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...> um3_bb0.8_Nylon_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ...g => um3_bb0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.8_PLA_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- ... => um3_bb0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg} | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename resources/quality/ultimaker3/{um3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg => um3_aa0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg => um3_aa0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg => um3_aa0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg => um3_aa0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg} (86%) rename resources/quality/ultimaker3/{um3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg => um3_aa0.8_PVA_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg => um3_aa0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.4_ABS_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.4_CPEP_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.4_CPE_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.4_Nylon_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.4_PLA_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.4_TPU_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_Nylon_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg} (86%) rename resources/quality/ultimaker3/{um3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_PLA_Not_Supported_Superdraft_Quality.inst.cfg} (87%) rename resources/quality/ultimaker3/{um3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg => um3_bb0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg} (87%) diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg index d5f7f74003..6e5a16ba1f 100755 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_abs_ultimaker3_AA_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg index 62919c4893..9cc2999ed2 100755 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_cpe_plus_ultimaker3_AA_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg index df7f80d05e..643f981093 100755 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_cpe_ultimaker3_AA_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg similarity index 86% rename from resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg index 7b4348f427..14b08854b8 100755 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker3 [metadata] weight = 0 type = quality -quality_type = draft +quality_type = superdraft material = generic_pc_ultimaker3_AA_0.8 supported = False diff --git a/resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Superdraft_Quality.inst.cfg index 1c0cc47858..5dbfab6341 100755 --- a/resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Superdraft_Quality.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker3 [metadata] weight = 0 type = quality -quality_type = draft +quality_type = superdraft material = generic_pva_ultimaker3_AA_0.8 supported = False diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg index 53670883ce..ec04652763 100755 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker3 [metadata] weight = 0 type = quality -quality_type = draft +quality_type = superdraft material = generic_tpu_ultimaker3_AA_0.8 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Superdraft_Quality.inst.cfg index f879fd9b1e..a2d097ee09 100755 --- a/resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_abs_ultimaker3_BB_0.4 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Superdraft_Quality.inst.cfg index 545bd6bffc..c7a19c3299 100755 --- a/resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_cpe_plus_ultimaker3_BB_0.4 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Superdraft_Quality.inst.cfg index e1fcb3b2d1..2c92677a40 100755 --- a/resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_cpe_ultimaker3_BB_0.4 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Superdraft_Quality.inst.cfg index 8a36512403..d8c202efe8 100755 --- a/resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_nylon_ultimaker3_BB_0.4 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Superdraft_Quality.inst.cfg index 34b05c50a9..f394ea40b4 100755 --- a/resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_pla_ultimaker3_BB_0.4 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Superdraft_Quality.inst.cfg index 123e6f3500..7d00e9e0df 100755 --- a/resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_tpu_ultimaker3_BB_0.4 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg index b55e5bf6fc..2b65cf0aee 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_abs_ultimaker3_BB_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg index 07bcc1b3cb..6cec304241 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_cpe_plus_ultimaker3_BB_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg index 03b92896a1..cc38d9956f 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_cpe_ultimaker3_BB_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Superdraft_Quality.inst.cfg index 34bdf5250e..6f5099e267 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_nylon_ultimaker3_BB_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg similarity index 86% rename from resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg index 5eee274e87..f0c4723a42 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_pc_ultimaker3_BB_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Superdraft_Quality.inst.cfg index 1649753f2f..2ec598e2df 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_pla_ultimaker3_BB_0.8 weight = 0 supported = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg similarity index 87% rename from resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg rename to resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg index e5fd89294f..eb37c60507 100755 --- a/resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg @@ -5,7 +5,7 @@ definition = ultimaker3 [metadata] type = quality -quality_type = draft +quality_type = superdraft material = generic_tpu_ultimaker3_BB_0.8 weight = 0 supported = False From 6644a4d38618bf945725155a3880a290c25939b6 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 27 Mar 2017 11:09:40 +0200 Subject: [PATCH 2/6] Revert "Prevent MachineSettings dialog go beyond the top of screen" This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be. --- resources/qml/Preferences/MachinesPage.qml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 1abd688b32..239e1a2aad 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -114,11 +114,6 @@ UM.ManagementPage property var content minimumWidth: 350 * Screen.devicePixelRatio; minimumHeight: 350 * Screen.devicePixelRatio; - - // prevent the Machine Settings dialog from going beyond the top of the screen - x: (x < 0) ? 0 : x - y: (y < 0) ? 0 : y - onContentChanged: { contents = content; From b67b41653fc7c24061103993016fb29b86a51488 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 27 Mar 2017 15:59:27 +0200 Subject: [PATCH 3/6] Fix spelling of maximum skin angle expansion description --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a7853328d3..8db96bb843 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1321,7 +1321,7 @@ "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, while an angle of 90° is vertical.", + "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, while an angle of 90° is vertical.", "unit": "°", "type": "float", "minimum_value": "0", From 63677558750065eac6f978a431fe0c4685ddc418 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 28 Mar 2017 10:21:52 +0200 Subject: [PATCH 4/6] Disabled center_on_select for windows, as pyqt has a bug with it --- cura/CuraApplication.py | 5 ++++- resources/qml/Preferences/GeneralPage.qml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 4790612315..dd5bc9994c 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -25,6 +25,7 @@ from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.Validator import Validator from UM.Message import Message from UM.i18n import i18nCatalog +from UM.Platform import Platform from UM.Operations.AddSceneNodeOperation import AddSceneNodeOperation from UM.Operations.RemoveSceneNodeOperation import RemoveSceneNodeOperation @@ -717,7 +718,9 @@ class CuraApplication(QtApplication): else: # Default self.getController().setActiveTool("TranslateTool") - if Preferences.getInstance().getValue("view/center_on_select"): + + # Hack: QVector bindings are broken on PyQt 5.7.1 on Windows. This disables it being called at all. + if Preferences.getInstance().getValue("view/center_on_select") and not Platform.isWindows(): self._center_after_select = True else: if self.getController().getActiveTool(): diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 7db4364619..2d5e91308a 100755 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -242,6 +242,7 @@ UM.PreferencesPage text: catalog.i18nc("@action:button","Center camera when item is selected"); checked: boolCheck(UM.Preferences.getValue("view/center_on_select")) onClicked: UM.Preferences.setValue("view/center_on_select", checked) + enabled: Qt.platform.os != "windows" // Hack: disable the feature on windows as it's broken for pyqt 5.7.1. } } From 910ff7aceab693ae074f512c3b2c91809820b796 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 28 Mar 2017 11:59:07 +0200 Subject: [PATCH 5/6] No longer check printer state when no material lengths are known This fixes issues with g-code from g-code reader not having material lengths set. CURA-3604 --- .../NetworkPrinterOutputDevice.py | 105 +++++++++--------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py index b89ed58f18..323f51dafe 100644 --- a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py @@ -618,64 +618,67 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._gcode = getattr(Application.getInstance().getController().getScene(), "gcode_list") print_information = Application.getInstance().getPrintInformation() - - # Check if print cores / materials are loaded at all. Any failure in these results in an Error. - for index in range(0, self._num_extruders): - if print_information.materialLengths[index] != 0: - if self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] == "": - Logger.log("e", "No cartridge loaded in slot %s, unable to start print", index + 1) - self._error_message = Message( - i18n_catalog.i18nc("@info:status", "Unable to start a new print job. No PrinterCore loaded in slot {0}".format(index + 1))) - self._error_message.show() - return - if self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["guid"] == "": - Logger.log("e", "No material loaded in slot %s, unable to start print", index + 1) - self._error_message = Message( - i18n_catalog.i18nc("@info:status", - "Unable to start a new print job. No material loaded in slot {0}".format(index + 1))) - self._error_message.show() - return - warnings = [] # There might be multiple things wrong. Keep a list of all the stuff we need to warn about. - for index in range(0, self._num_extruders): - # Check if there is enough material. Any failure in these results in a warning. - material_length = self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["length_remaining"] - if material_length != -1 and print_information.materialLengths[index] > material_length: - Logger.log("w", "Printer reports that there is not enough material left for extruder %s. We need %s and the printer has %s", index + 1, print_information.materialLengths[index], material_length) - warnings.append(i18n_catalog.i18nc("@label", "Not enough material for spool {0}.").format(index+1)) + # Only check for mistakes if there is material length information. + if print_information.materialLengths: + # Check if print cores / materials are loaded at all. Any failure in these results in an Error. + for index in range(0, self._num_extruders): + if print_information.materialLengths[index] != 0: + if self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] == "": + Logger.log("e", "No cartridge loaded in slot %s, unable to start print", index + 1) + self._error_message = Message( + i18n_catalog.i18nc("@info:status", "Unable to start a new print job. No PrinterCore loaded in slot {0}".format(index + 1))) + self._error_message.show() + return + if self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["guid"] == "": + Logger.log("e", "No material loaded in slot %s, unable to start print", index + 1) + self._error_message = Message( + i18n_catalog.i18nc("@info:status", + "Unable to start a new print job. No material loaded in slot {0}".format(index + 1))) + self._error_message.show() + return - # Check if the right cartridges are loaded. Any failure in these results in a warning. - extruder_manager = cura.Settings.ExtruderManager.ExtruderManager.getInstance() - if print_information.materialLengths[index] != 0: - variant = extruder_manager.getExtruderStack(index).findContainer({"type": "variant"}) - core_name = self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] - if variant: - if variant.getName() != core_name: - Logger.log("w", "Extruder %s has a different Cartridge (%s) as Cura (%s)", index + 1, core_name, variant.getName()) - warnings.append(i18n_catalog.i18nc("@label", "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1))) + for index in range(0, self._num_extruders): + # Check if there is enough material. Any failure in these results in a warning. + material_length = self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["length_remaining"] + if material_length != -1 and print_information.materialLengths[index] > material_length: + Logger.log("w", "Printer reports that there is not enough material left for extruder %s. We need %s and the printer has %s", index + 1, print_information.materialLengths[index], material_length) + warnings.append(i18n_catalog.i18nc("@label", "Not enough material for spool {0}.").format(index+1)) - material = extruder_manager.getExtruderStack(index).findContainer({"type": "material"}) - if material: - remote_material_guid = self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["guid"] - if material.getMetaDataEntry("GUID") != remote_material_guid: - Logger.log("w", "Extruder %s has a different material (%s) as Cura (%s)", index + 1, - remote_material_guid, - material.getMetaDataEntry("GUID")) + # Check if the right cartridges are loaded. Any failure in these results in a warning. + extruder_manager = cura.Settings.ExtruderManager.ExtruderManager.getInstance() + if print_information.materialLengths[index] != 0: + variant = extruder_manager.getExtruderStack(index).findContainer({"type": "variant"}) + core_name = self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] + if variant: + if variant.getName() != core_name: + Logger.log("w", "Extruder %s has a different Cartridge (%s) as Cura (%s)", index + 1, core_name, variant.getName()) + warnings.append(i18n_catalog.i18nc("@label", "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1))) - remote_materials = UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().findInstanceContainers(type = "material", GUID = remote_material_guid, read_only = True) - remote_material_name = "Unknown" - if remote_materials: - remote_material_name = remote_materials[0].getName() - warnings.append(i18n_catalog.i18nc("@label", "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}").format(material.getName(), remote_material_name, index + 1)) + material = extruder_manager.getExtruderStack(index).findContainer({"type": "material"}) + if material: + remote_material_guid = self._json_printer_state["heads"][0]["extruders"][index]["active_material"]["guid"] + if material.getMetaDataEntry("GUID") != remote_material_guid: + Logger.log("w", "Extruder %s has a different material (%s) as Cura (%s)", index + 1, + remote_material_guid, + material.getMetaDataEntry("GUID")) - try: - is_offset_calibrated = self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["offset"]["state"] == "valid" - except KeyError: # Older versions of the API don't expose the offset property, so we must asume that all is well. - is_offset_calibrated = True + remote_materials = UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().findInstanceContainers(type = "material", GUID = remote_material_guid, read_only = True) + remote_material_name = "Unknown" + if remote_materials: + remote_material_name = remote_materials[0].getName() + warnings.append(i18n_catalog.i18nc("@label", "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}").format(material.getName(), remote_material_name, index + 1)) - if not is_offset_calibrated: - warnings.append(i18n_catalog.i18nc("@label", "Print core {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1)) + try: + is_offset_calibrated = self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["offset"]["state"] == "valid" + except KeyError: # Older versions of the API don't expose the offset property, so we must asume that all is well. + is_offset_calibrated = True + + if not is_offset_calibrated: + warnings.append(i18n_catalog.i18nc("@label", "Print core {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1)) + else: + Logger.log("w", "There was no material usage found. No check to match used material with machine is done.") if warnings: text = i18n_catalog.i18nc("@label", "Are you sure you wish to print with the selected configuration?") From db2766aba160684ffce13881f50b6b6933a35bbd Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 28 Mar 2017 12:53:46 +0200 Subject: [PATCH 6/6] fix: move prime positions to the sides (CURA-3605) --- resources/extruders/ultimaker3_extended_extruder_left.def.json | 2 +- resources/extruders/ultimaker3_extended_extruder_right.def.json | 2 +- resources/extruders/ultimaker3_extruder_left.def.json | 2 +- resources/extruders/ultimaker3_extruder_right.def.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/extruders/ultimaker3_extended_extruder_left.def.json b/resources/extruders/ultimaker3_extended_extruder_left.def.json index 3335e85ae3..2fcf1d015a 100644 --- a/resources/extruders/ultimaker3_extended_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_left.def.json @@ -23,7 +23,7 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 207 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": 170 }, + "extruder_prime_pos_x": { "default_value": 9 }, "extruder_prime_pos_y": { "default_value": 6 }, "extruder_prime_pos_z": { "default_value": 2 } } diff --git a/resources/extruders/ultimaker3_extended_extruder_right.def.json b/resources/extruders/ultimaker3_extended_extruder_right.def.json index 2e072753b1..b60cc82dd7 100644 --- a/resources/extruders/ultimaker3_extended_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_right.def.json @@ -23,7 +23,7 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 189 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 182 }, + "extruder_prime_pos_x": { "default_value": 222 }, "extruder_prime_pos_y": { "default_value": 6 }, "extruder_prime_pos_z": { "default_value": 2 } } diff --git a/resources/extruders/ultimaker3_extruder_left.def.json b/resources/extruders/ultimaker3_extruder_left.def.json index 141fd2f80c..6f07718b63 100644 --- a/resources/extruders/ultimaker3_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extruder_left.def.json @@ -23,7 +23,7 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 207 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": 170 }, + "extruder_prime_pos_x": { "default_value": 9 }, "extruder_prime_pos_y": { "default_value": 6 }, "extruder_prime_pos_z": { "default_value": 2 } } diff --git a/resources/extruders/ultimaker3_extruder_right.def.json b/resources/extruders/ultimaker3_extruder_right.def.json index 50a369e3ed..bc51b0da4b 100644 --- a/resources/extruders/ultimaker3_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extruder_right.def.json @@ -23,7 +23,7 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 189 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 182 }, + "extruder_prime_pos_x": { "default_value": 222 }, "extruder_prime_pos_y": { "default_value": 6 }, "extruder_prime_pos_z": { "default_value": 2 } }