From 09a64c7ba054e2e15475df63449731b5a1a76ba3 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Oct 2016 15:30:45 +0200 Subject: [PATCH 1/7] JSON feat: anti support meshes (CURA-2077) --- resources/definitions/fdmprinter.def.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e3b75d3813..381922fadd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3693,6 +3693,17 @@ "settable_per_meshgroup": false, "settable_globally": false }, + "anti_support_mesh": + { + "label": "Anti Overhang Mesh", + "description": "Use this mesh to specify where no part of the model should be detected as overhang. This can be used to remove unwanted support structure.", + "type": "bool", + "default_value": false, + "settable_per_mesh": true, + "settable_per_extruder": false, + "settable_per_meshgroup": false, + "settable_globally": false + }, "magic_mesh_surface_mode": { "label": "Surface Mode", From 2c87cddd3c9c1688ee49b17f42dcd2c38627fd3d Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Oct 2016 15:32:10 +0200 Subject: [PATCH 2/7] JSON refactor: anti_support_mesh ==> anti_overhang_mesh (CURA-2077) --- 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 381922fadd..d7ec656a29 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3693,7 +3693,7 @@ "settable_per_meshgroup": false, "settable_globally": false }, - "anti_support_mesh": + "anti_overhang_mesh": { "label": "Anti Overhang Mesh", "description": "Use this mesh to specify where no part of the model should be detected as overhang. This can be used to remove unwanted support structure.", From b84071196022155a9086654ae44dfff7bbb1872d Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 14 Oct 2016 15:48:55 +0200 Subject: [PATCH 3/7] JSON feat: support_mesh (CURA-2077) --- resources/definitions/fdmprinter.def.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d7ec656a29..8cf709ee77 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3693,6 +3693,17 @@ "settable_per_meshgroup": false, "settable_globally": false }, + "support_mesh": + { + "label": "Support Mesh", + "description": "Use this mesh to specify support areas. This can be used to generate support structure.", + "type": "bool", + "default_value": false, + "settable_per_mesh": true, + "settable_per_extruder": false, + "settable_per_meshgroup": false, + "settable_globally": false + }, "anti_overhang_mesh": { "label": "Anti Overhang Mesh", From 1787b1e65be90396796f2800e95afef5e747ac09 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 19 Oct 2016 17:26:18 +0200 Subject: [PATCH 4/7] JSON refactor: support_mesh ==> overhang_mesh (CURA-2077) --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8cf709ee77..0109f0344b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3693,10 +3693,10 @@ "settable_per_meshgroup": false, "settable_globally": false }, - "support_mesh": + "overhang_mesh": { - "label": "Support Mesh", - "description": "Use this mesh to specify support areas. This can be used to generate support structure.", + "label": "Overhang Mesh", + "description": "Use this mesh to specify areas which should be supported. This can be used to generate support structure.", "type": "bool", "default_value": false, "settable_per_mesh": true, From 1b853de9810abb619a54e1086772c4146ec55cf8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 2 Nov 2016 15:55:20 +0100 Subject: [PATCH 5/7] Revert "JSON refactor: support_mesh ==> overhang_mesh (CURA-2077)" This reverts commit d675ffe6e9765e5118b85585502aee7a1cb3283c. --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0109f0344b..8cf709ee77 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3693,10 +3693,10 @@ "settable_per_meshgroup": false, "settable_globally": false }, - "overhang_mesh": + "support_mesh": { - "label": "Overhang Mesh", - "description": "Use this mesh to specify areas which should be supported. This can be used to generate support structure.", + "label": "Support Mesh", + "description": "Use this mesh to specify support areas. This can be used to generate support structure.", "type": "bool", "default_value": false, "settable_per_mesh": true, From 9f468b8fcf0db933cc4fa7a96b99b60f6e00ad62 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Fri, 18 Nov 2016 10:28:44 +0100 Subject: [PATCH 6/7] Correcting German translation Contributes to CURA-2862 --- resources/i18n/de/cura.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po index b015b2e43b..985764f6ff 100644 --- a/resources/i18n/de/cura.po +++ b/resources/i18n/de/cura.po @@ -1913,7 +1913,7 @@ msgstr "&Beenden" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:97 msgctxt "@action:inmenu" msgid "Configure Cura..." -msgstr "Cura wird konfiguriert..." +msgstr "Cura konfigurieren..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 msgctxt "@action:inmenu menubar:printer" From 124e2b47eac0b5b3587dfbb1ca66d59f6f94c4d8 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 23 Nov 2016 11:56:27 +0100 Subject: [PATCH 7/7] Fix display issue layer view reset positions, center point in select all. CURA-2925 CURA-3012 --- cura/CuraApplication.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 4e33cc2e1e..ff70a2e25c 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -734,6 +734,8 @@ class CuraApplication(QtApplication): continue # Node that doesnt have a mesh and is not a group. if node.getParent() and node.getParent().callDecoration("isGroup"): continue # Grouped nodes don't need resetting as their parent (the group) is resetted) + if not node.isSelectable(): + continue # i.e. node with layer data Selection.add(node) ## Delete all nodes containing mesh data in the scene. @@ -773,6 +775,8 @@ class CuraApplication(QtApplication): continue # Node that doesnt have a mesh and is not a group. if node.getParent() and node.getParent().callDecoration("isGroup"): continue # Grouped nodes don't need resetting as their parent (the group) is resetted) + if not node.isSelectable(): + continue # i.e. node with layer data nodes.append(node) if nodes: @@ -799,6 +803,8 @@ class CuraApplication(QtApplication): continue # Node that doesnt have a mesh and is not a group. if node.getParent() and node.getParent().callDecoration("isGroup"): continue # Grouped nodes don't need resetting as their parent (the group) is resetted) + if not node.isSelectable(): + continue # i.e. node with layer data nodes.append(node) if nodes: