From 33d16f86012aba9cda6117677cd131db345dbdfe Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 22 Mar 2017 14:51:53 +0100 Subject: [PATCH 1/6] Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555 --- ...3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ..._aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...m3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ..._bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ..._bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...m3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ ...3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg | 13 +++++++++++++ 19 files changed, 247 insertions(+) create mode 100755 resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg create mode 100755 resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..22b4a4cab5 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_abs_ultimaker3_AA_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..7dab64e789 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_cpe_plus_ultimaker3_AA_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..87ae8207c3 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_cpe_ultimaker3_AA_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..373df4f76f --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +weight = 0 +type = quality +quality_type = draft +material = generic_pc_ultimaker3_AA_0.8 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..abb88fba7f --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_PVA_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +weight = 0 +type = quality +quality_type = draft +material = generic_pva_ultimaker3_AA_0.8 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..15b9984b18 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +weight = 0 +type = quality +quality_type = draft +material = generic_tpu_ultimaker3_AA_0.8 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..65e2227cca --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.4_ABS_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_abs_ultimaker3_BB_0.4 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..d61f05c7fc --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.4_CPEP_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_cpe_plus_ultimaker3_BB_0.4 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..1c44595bfb --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.4_CPE_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_cpe_ultimaker3_BB_0.4 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..19d76e55c2 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.4_Nylon_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_nylon_ultimaker3_BB_0.4 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..4b88233967 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.4_PLA_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_pla_ultimaker3_BB_0.4 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..2dbd3516fd --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.4_TPU_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_tpu_ultimaker3_BB_0.4 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..f2e318d318 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_ABS_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_abs_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..021aedbe22 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_CPEP_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_cpe_plus_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..dc7add0c1d --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_CPE_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_cpe_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..f1a605603d --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_Nylon_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_nylon_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..e393255ad1 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_PC_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_pc_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..fe67efa325 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_PLA_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_pla_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] 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_Draft_Quality.inst.cfg new file mode 100755 index 0000000000..1c92c792f5 --- /dev/null +++ b/resources/quality/ultimaker3/um3_bb0.8_TPU_Not_Supported_Draft_Quality.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 2 +name = Not Supported +definition = ultimaker3 + +[metadata] +type = quality +quality_type = draft +material = generic_tpu_ultimaker3_BB_0.8 +weight = 0 +supported = false + +[values] From e35d276e25a1cc1700e7c1572feaa8ccba9efccf Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 22 Mar 2017 15:20:57 +0100 Subject: [PATCH 2/6] Complete Changelog for 2.5.0 CURA-3467 --- plugins/ChangeLogPlugin/ChangeLog.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index 2a4e57fdda..2dd6a1a7c8 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -26,6 +26,29 @@ The g-code reader has been reintroduced, which means users can load g-code from *Discard or Keep Changes popup We’ve changed the popup that appears when a user changes a printing profile after setting custom printing settings. It is now more informative and helpful. +*Bug fixes +- Window overflow: On some configurations (OS and screen dependant), an overflow on the General (Preferences) panel and the credits list on the About window occurred. This is now fixed. +- “Center camera when the item is selected”: This is now set to ‘off’ by default. +- Removal of file extension: When users save a file or project (without changing the file type), no file extension is added to the name. It’s only when users change to another file type that the extension is added. +- Ultimaker 3 Extended connectivity. Selecting Ultimaker 3 Extended in Cura let you connect and print with Ultimaker 3, without any warning. This now has been fixed. +- Different Y / Z colors: Y and Z colors in the tool menu are now similar to the colors on the build plate. +- No collision areas: No collision areas used to be generated for some models when "keep models apart" was activated. This is now fixed. +- Perimeter gaps: Perimeter gaps are not filled often enough; we’ve now amended this. +- File location after restart: The old version of Cura didn’t remember the last opened file location after it’s been restarted. Now it has been fixed. +- Project name: The project name changes after the project is opened. This now has been fixed. +- Slicing when error value is given (print core 2): When a support is printed with the Extruder 2 (PVA), some support settings will trigger a slice when an error value is given. We’ve now sorted this out. +- Support Towers: Support Towers can now be disabled. +- Support bottoms: When putting one object on top of another with some space in between, and selecting support with support bottom interface, no support bottom is printed. This has now been resolved. +- Summary box size: We’ve enlarged the summary box when saving the project. +- Cubic subdivision infill: In the past, the cubic subdivision infill sometimes didn’t produce the infill (WIN) – this has now been addressed. +- Spiralize outer contour and fill small gaps: When combining Fill Gaps Between Walls with Spiralize Outer Contour, the model gets a massive infill. +- Experimental post-processing plugin: Since the TwaekAtZ post-processing plugin is not officially supported, we added the ‘Experimental’ tag. + +*3rd party printers (bug fixes) +- Folgertech printer definition has been added. +- Hello BEE Prusa printer definition has been added. +- Velleman Vertex K8400 printer definitions have been added for both single-extrusion and dual-extrusion versions. +- Material profiles for Cartesio printers have been updated. [2.4.0] *Project saving & opening From fa7dc3a7080603a5d5f64c7599c2524d4ffcbe55 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 22 Mar 2017 16:01:46 +0100 Subject: [PATCH 3/6] Use onActivated for profile override combobox --- resources/qml/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml index 2aa44f0bf0..d9de592dd7 100644 --- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml @@ -155,9 +155,9 @@ UM.Dialog } } - onCurrentIndexChanged: + onActivated: { - var code = model.get(currentIndex).code; + var code = model.get(index).code; UM.Preferences.setValue("cura/choice_on_profile_override", code); if (code == "always_keep") { From 96e97802734cec84aade73be8f50ea7d905c6474 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 23 Mar 2017 08:53:57 +0100 Subject: [PATCH 4/6] Fix typo in changelog 2.5.0 --- plugins/ChangeLogPlugin/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index 2dd6a1a7c8..c7b63be889 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -42,7 +42,7 @@ We’ve changed the popup that appears when a user changes a printing profile af - Summary box size: We’ve enlarged the summary box when saving the project. - Cubic subdivision infill: In the past, the cubic subdivision infill sometimes didn’t produce the infill (WIN) – this has now been addressed. - Spiralize outer contour and fill small gaps: When combining Fill Gaps Between Walls with Spiralize Outer Contour, the model gets a massive infill. -- Experimental post-processing plugin: Since the TwaekAtZ post-processing plugin is not officially supported, we added the ‘Experimental’ tag. +- Experimental post-processing plugin: Since the TweakAtZ post-processing plugin is not officially supported, we added the ‘Experimental’ tag. *3rd party printers (bug fixes) - Folgertech printer definition has been added. From a0f841e8eb2e3fc41a5d053232ea29cf538e30be Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 23 Mar 2017 13:45:55 +0100 Subject: [PATCH 5/6] Prevent MachineSettings dialog go beyond the top of screen --- resources/qml/Preferences/MachinesPage.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 239e1a2aad..1abd688b32 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -114,6 +114,11 @@ 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 ecbf0e1e281cbbf11aee95214b5165a59d211a0c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 23 Mar 2017 15:14:34 +0100 Subject: [PATCH 6/6] Only add center to list for merge if there is one --- cura/CuraApplication.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index b6816a38ae..4790612315 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1031,7 +1031,9 @@ class CuraApplication(QtApplication): transformation.setTranslation(zero_translation) transformed_mesh = mesh.getTransformed(transformation) center = transformed_mesh.getCenterPosition() - object_centers.append(center) + if center is not None: + object_centers.append(center) + if object_centers and len(object_centers) > 0: middle_x = sum([v.x for v in object_centers]) / len(object_centers) middle_y = sum([v.y for v in object_centers]) / len(object_centers)