From 2c1028e13728a6c306402106bb239710b5eb9835 Mon Sep 17 00:00:00 2001
From: Tim Kuipers <t.kuipers@ultimaker.com>
Date: Fri, 11 Nov 2016 12:01:41 +0100
Subject: [PATCH] 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",