From 2c1028e13728a6c306402106bb239710b5eb9835 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 11 Nov 2016 12:01:41 +0100 Subject: [PATCH 1/3] JSON feat: z seam position (CURA-1461) --- cura/CuraApplication.py | 2 ++ resources/definitions/fdmprinter.def.json | 28 ++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 7be20305c4..ce0b3525b6 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -264,6 +264,8 @@ class CuraApplication(QtApplication): shell wall_thickness top_bottom_thickness + z_seam_x + z_seam_y infill infill_sparse_density material diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 45a1d491af..59c269a1fc 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -950,13 +950,39 @@ "type": "enum", "options": { - "back": "Back", + "back": "User Specified", "shortest": "Shortest", "random": "Random" }, "default_value": "shortest", "settable_per_mesh": true }, + "z_seam_x": + { + "label": "Z Seam X", + "description": "The X coordinate of the position near where to start printing each part in a layer.", + "unit": "mm", + "type": "float", + "default_value": 100.0, + "value": "machine_width / 2", + "enabled": "'back' in extruderValues('z_seam_type')", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": true + }, + "z_seam_y": + { + "label": "Z Seam Y", + "description": "The Y coordinate of the position near where to start printing each part in a layer.", + "unit": "mm", + "type": "float", + "default_value": 100.0, + "value": "machine_depth / 2", + "enabled": "'back' in extruderValues('z_seam_type')", + "settable_per_mesh": true, + "settable_per_extruder": false, + "settable_per_meshgroup": true + }, "skin_no_small_gaps_heuristic": { "label": "Ignore Small Z Gaps", From 84ca1f9cd7ac9b609872ba5881c688f6d8291446 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 25 Nov 2016 16:44:09 +0100 Subject: [PATCH 2/3] JSON fix: make z_seam_pos settable per mesh (CURA-1461) --- resources/definitions/fdmprinter.def.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 59c269a1fc..d2bcbe0d9c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -965,10 +965,8 @@ "type": "float", "default_value": 100.0, "value": "machine_width / 2", - "enabled": "'back' in extruderValues('z_seam_type')", - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": true + "enabled": "z_seam_type == 'back'", + "settable_per_mesh": true }, "z_seam_y": { @@ -978,10 +976,8 @@ "type": "float", "default_value": 100.0, "value": "machine_depth / 2", - "enabled": "'back' in extruderValues('z_seam_type')", - "settable_per_mesh": true, - "settable_per_extruder": false, - "settable_per_meshgroup": true + "enabled": "z_seam_type == 'back'", + "settable_per_mesh": true }, "skin_no_small_gaps_heuristic": { From 8da058d95d8d24ec2991f2efd64c73b00a11860b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 30 Nov 2016 16:25:40 +0100 Subject: [PATCH 3/3] JSON fix: description of z_seam_type still mentioned 'Back' (CURA-1461) --- 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 d2bcbe0d9c..4abb9e547d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -946,7 +946,7 @@ "z_seam_type": { "label": "Z Seam Alignment", - "description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these at the back, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.", + "description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.", "type": "enum", "options": {