From d6c25fcd10add0351a9663374e5dab96bc2cfdf2 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 7 Jul 2016 21:04:23 +0200 Subject: [PATCH 1/3] JSON feat: infill mesh (CURA-833) --- 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 50c3676540..0dd44a0647 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3042,6 +3042,17 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "infill_mesh": + { + "label": "Infill Mesh", + "description": "Use this mesh to modify the infill of other meshes with which it overlaps. Replaces infill regions of other meshes with regions for this mesh.", + "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 4349f6c75b7db8be90ec6bccd00a2b2a4035cbbb Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 7 Jul 2016 21:18:25 +0200 Subject: [PATCH 2/3] fix: make infill_mesh visible by default because it's the only setting which is only visible in the per-object settings menu which is not normally visible (CURA-833) Because it should never show up in the normal global/extruder settings tab, people might forget about this setting. It's one of the reasons per-object settings is awesome ^^. --- cura/CuraApplication.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 88ced6f68e..de933ecb88 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -233,6 +233,7 @@ class CuraApplication(QtApplication): meshfix blackmagic print_sequence + infill_mesh dual experimental """.replace("\n", ";").replace(" ", "")) From 91082404be25681aeb53f3600615f6d77586a1c8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 7 Jul 2016 21:18:46 +0200 Subject: [PATCH 3/3] JSON feat: infill_mesh_order (CURA-833) --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0dd44a0647..a2ac13e0e2 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3053,6 +3053,19 @@ "settable_per_meshgroup": false, "settable_globally": false }, + "infill_mesh_order": + { + "label": "Infill Mesh Order", + "description": "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.", + "default_value": 0, + "minimum_value_warning": "0", + "maximum_value_warning": "50", + "type": "int", + "settable_per_mesh": true, + "settable_per_extruder": false, + "settable_per_meshgroup": false, + "settable_globally": false + }, "magic_mesh_surface_mode": { "label": "Surface Mode",