From 0cc0fe93b86d70fffe1b712d2c1da5791c8c8f93 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 25 Aug 2017 09:25:53 +0100 Subject: [PATCH 1/8] Add further options to z_seam_type. Can now specify that the z-seam should be located in either the most concave region of the outline, the most convex region or the most curved (concave or convex) region. --- resources/definitions/fdmprinter.def.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9ca3937123..69dc7df497 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1228,7 +1228,10 @@ { "back": "User Specified", "shortest": "Shortest", - "random": "Random" + "random": "Random", + "most_curvature_convex": "Most Convex Region", + "most_curvature_concave": "Most Concave Region", + "most_curvature": "Most Curved Region" }, "default_value": "shortest", "limit_to_extruder": "wall_0_extruder_nr", From d40a3176813e9d77779260eeaa32cb8844d37715 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 25 Aug 2017 13:47:48 +0100 Subject: [PATCH 2/8] Revert the z_seam_type options back to how they originally were and add z_seam_corner. --- resources/definitions/fdmprinter.def.json | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 69dc7df497..4a9f6899d5 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1228,10 +1228,7 @@ { "back": "User Specified", "shortest": "Shortest", - "random": "Random", - "most_curvature_convex": "Most Convex Region", - "most_curvature_concave": "Most Concave Region", - "most_curvature": "Most Curved Region" + "random": "Random" }, "default_value": "shortest", "limit_to_extruder": "wall_0_extruder_nr", @@ -1261,6 +1258,23 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, + "z_seam_corner": + { + "label": "Z Seam Corner Preference", + "description": "Control whether corners on the model outline influence the position of the Z-seam.", + "type": "enum", + "options": + { + "z_seam_corner_none": "Ignore Corners", + "z_seam_corner_inner": "Inner Corners", + "z_seam_corner_outer": "Outer corners", + "z_seam_corner_any": "Any Corner" + }, + "default_value": "z_seam_corner_inner", + "enabled": "z_seam_type == 'back'", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, "z_seam_relative": { "label": "Z Seam Relative", From 438ea142c93a7f87948605804bd7aa874fb4f850 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 25 Aug 2017 14:10:32 +0100 Subject: [PATCH 3/8] Tweak z_seam_corner strings. --- 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 4a9f6899d5..53eeb97878 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1260,14 +1260,14 @@ }, "z_seam_corner": { - "label": "Z Seam Corner Preference", - "description": "Control whether corners on the model outline influence the position of the Z-seam.", + "label": "Seam Corner Preference", + "description": "Control whether corners on the model outline influence the position of the seam.", "type": "enum", "options": { "z_seam_corner_none": "Ignore Corners", "z_seam_corner_inner": "Inner Corners", - "z_seam_corner_outer": "Outer corners", + "z_seam_corner_outer": "Outer Corners", "z_seam_corner_any": "Any Corner" }, "default_value": "z_seam_corner_inner", From ea9310507907c0024e57d327307f9ad2f63d1937 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 25 Aug 2017 15:26:24 +0100 Subject: [PATCH 4/8] Added sharpest_corner option to z_seam_type. --- resources/definitions/fdmprinter.def.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 53eeb97878..f085fd6789 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1228,7 +1228,8 @@ { "back": "User Specified", "shortest": "Shortest", - "random": "Random" + "random": "Random", + "sharpest_corner": "Sharpest Corner" }, "default_value": "shortest", "limit_to_extruder": "wall_0_extruder_nr", @@ -1271,7 +1272,7 @@ "z_seam_corner_any": "Any Corner" }, "default_value": "z_seam_corner_inner", - "enabled": "z_seam_type == 'back'", + "enabled": "z_seam_type == 'back' or z_seam_type == 'sharpest_corner'", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, From 8c599c48698d12721af7363145cd972b899daa08 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 25 Aug 2017 17:09:47 +0100 Subject: [PATCH 5/8] The seam corner setting is now available for all seam types except random. --- 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 f085fd6789..36baf6dbfc 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1272,7 +1272,7 @@ "z_seam_corner_any": "Any Corner" }, "default_value": "z_seam_corner_inner", - "enabled": "z_seam_type == 'back' or z_seam_type == 'sharpest_corner'", + "enabled": "z_seam_type != 'random'", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, From 27967a1531009b52882f3cdd6c094c8e7002b0d3 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 30 Aug 2017 19:19:16 +0100 Subject: [PATCH 6/8] Tweak z_seam_corner option strings and the descriptive blurb. --- resources/definitions/fdmprinter.def.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 36baf6dbfc..c45de63eab 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1262,14 +1262,14 @@ "z_seam_corner": { "label": "Seam Corner Preference", - "description": "Control whether corners on the model outline influence the position of the seam.", + "description": "Control whether corners on the model outline influence the position of the seam. When set to Hide Seam, the seam will be located at a nearby inside corner. When set to Expose Seam, the seam will be located at a nearby outside corner. When set to Hide or Expose Seam, the seam will be located at any nearby corner.", "type": "enum", "options": { - "z_seam_corner_none": "Ignore Corners", - "z_seam_corner_inner": "Inner Corners", - "z_seam_corner_outer": "Outer Corners", - "z_seam_corner_any": "Any Corner" + "z_seam_corner_none": "No Influence", + "z_seam_corner_inner": "Hide Seam", + "z_seam_corner_outer": "Expose Seam", + "z_seam_corner_any": "Hide or Expose Seam" }, "default_value": "z_seam_corner_inner", "enabled": "z_seam_type != 'random'", From 092bc2f9169b2950d9be2b7003895f899b00aadb Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 30 Aug 2017 19:20:49 +0100 Subject: [PATCH 7/8] Revert "Tweak z_seam_corner option strings and the descriptive blurb." This reverts commit 27967a1531009b52882f3cdd6c094c8e7002b0d3. --- resources/definitions/fdmprinter.def.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c45de63eab..36baf6dbfc 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1262,14 +1262,14 @@ "z_seam_corner": { "label": "Seam Corner Preference", - "description": "Control whether corners on the model outline influence the position of the seam. When set to Hide Seam, the seam will be located at a nearby inside corner. When set to Expose Seam, the seam will be located at a nearby outside corner. When set to Hide or Expose Seam, the seam will be located at any nearby corner.", + "description": "Control whether corners on the model outline influence the position of the seam.", "type": "enum", "options": { - "z_seam_corner_none": "No Influence", - "z_seam_corner_inner": "Hide Seam", - "z_seam_corner_outer": "Expose Seam", - "z_seam_corner_any": "Hide or Expose Seam" + "z_seam_corner_none": "Ignore Corners", + "z_seam_corner_inner": "Inner Corners", + "z_seam_corner_outer": "Outer Corners", + "z_seam_corner_any": "Any Corner" }, "default_value": "z_seam_corner_inner", "enabled": "z_seam_type != 'random'", From 0efa2ac1683e998b2c7deb5dd4f6baed18c0044f Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 30 Aug 2017 20:14:35 +0100 Subject: [PATCH 8/8] Tweak z_seam_corner option strings and the descriptive blurb. --- resources/definitions/fdmprinter.def.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 36baf6dbfc..fa09b5b27e 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1262,14 +1262,14 @@ "z_seam_corner": { "label": "Seam Corner Preference", - "description": "Control whether corners on the model outline influence the position of the seam.", + "description": "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner.", "type": "enum", "options": { - "z_seam_corner_none": "Ignore Corners", - "z_seam_corner_inner": "Inner Corners", - "z_seam_corner_outer": "Outer Corners", - "z_seam_corner_any": "Any Corner" + "z_seam_corner_none": "None", + "z_seam_corner_inner": "Hide Seam", + "z_seam_corner_outer": "Expose Seam", + "z_seam_corner_any": "Hide or Expose Seam" }, "default_value": "z_seam_corner_inner", "enabled": "z_seam_type != 'random'",