Fix aligned seam & add some others:

 - contiguous: even more aligned
 - scattered: old random: random per island per layer
 - random : new random: every loop has its own random seam.

2 files changed, 20 insertions, 9 deletions

diff --git a/resources/ui_layout/default/print.as b/resources/ui_layout/default/print.as
index 85656054c..3c830bfd1 100644
--- a/resources/ui_layout/default/print.as
+++ b/resources/ui_layout/default/print.as
@@ -156,6 +156,10 @@ void s_not_thick_bridge_set(bool set)
 //    spRandom [spNearest] spAligned spRear [spCustom] spCost
 // ("Cost-based") ("Random") ("Aligned") ("Rear")
 // -> Corners Nearest Random Aligned Rear Custom
+
+//    spRandom spAllRandom [spNearest] spAligned spExtrAligned spRear [spCustom] spCost
+// ("Cost-based") ("Scattered") ("Random") ("Aligned") ("Contiguous") ("Rear")
+// -> Corners Nearest Scattered Random  Aligned Contiguous Rear Custom
 float user_angle = 0;
 float user_travel = 0;
 
@@ -164,8 +168,9 @@ int s_seam_position_get(string &out get_val)
 	int pos = get_int("seam_position");
 	string seam_pos;
 	get_string("seam_position", seam_pos);
-	if(pos < 5){
-		if (pos == 0) return 2;
+	if(pos < 7){
+		if (pos == 0) return 2;// Scattered
+		if (pos == 1) return 3;// Random
 		return pos + 1;
 	} else {
 		float angle = get_float("seam_angle_cost");
@@ -175,15 +180,23 @@ int s_seam_position_get(string &out get_val)
 		user_angle = angle;
 		user_travel = travel;
 	}
-	return 5;
+	return 7;
 }
 
 void s_seam_position_set(string &in set_val, int idx)
 {
 	if (idx == 2 ) {
-		set_int("seam_position", 0);
+		set_int("seam_position", 0); // Scattered
+	} else if (idx == 3) {
+		set_int("seam_position", 1); // Random
+	} else if (idx == 4) {
+		set_int("seam_position", 3); // Aligned
+	} else if (idx == 5) {
+		set_int("seam_position", 4); // Contiguous
+	} else if (idx == 6) {
+		set_int("seam_position", 5); // Rear
 	} else if (idx <= 1) {
-		set_int("seam_position", 5);
+		set_int("seam_position", 7);
 		if (idx == 0) {
 			set_percent("seam_angle_cost", 80);
 			set_percent("seam_travel_cost", 20);
@@ -191,10 +204,8 @@ void s_seam_position_set(string &in set_val, int idx)
 			set_percent("seam_angle_cost", 30);
 			set_percent("seam_travel_cost", 60);
 		}
-	} else if (idx < 5) {
-		set_int("seam_position", idx - 1);
 	} else {
-		set_int("seam_position", 5);
+		set_int("seam_position", 7);
 		if(user_angle > 0 || user_travel > 0){
 			set_percent("seam_angle_cost", user_angle);
 			set_percent("seam_travel_cost", user_travel);
diff --git a/resources/ui_layout/default/print.ui b/resources/ui_layout/default/print.ui
index d8e3cd442..b3f959aae 100644
--- a/resources/ui_layout/default/print.ui
+++ b/resources/ui_layout/default/print.ui
@@ -70,7 +70,7 @@ group:Advanced
 		setting:width$5:gap_fill_last
 	end_line
 	line:Seam
-		setting:tags$Simple$Advanced$Expert$Prusa$SuSi:script:enum$corners$Corners$nearest$Nearest$random$Random$aligned$Aligned$rear$Rear$custom$Custom:depends$seam_position$seam_angle_cost$seam_travel_cost:label$Seam position:label_width$12:sidetext_width$0:tooltip$Position of perimeters' starting points.\nCustom can be defined in Advanced or Expert mode. Cost-based settings let you choose the angle and travel cost. A high angle cost will place the seam where it can be hidden by a corner, the travel cost place the seam near the last position (often at the end of the previous infill).:s_seam_position
+		setting:tags$Simple$Advanced$Expert$Prusa$SuSi:script:enum$corners$Corners$nearest$Nearest$random$Scattered$allrandom$Random$aligned$Aligned$contiguous$Contiguous$rear$Rear$custom$Custom:depends$seam_position$seam_angle_cost$seam_travel_cost:label$Seam position:label_width$12:sidetext_width$0:tooltip$Position of perimeters' starting points.\nCustom can be defined in Advanced or Expert mode. Cost-based settings let you choose the angle and travel cost. A high angle cost will place the seam where it can be hidden by a corner, the travel cost place the seam near the last position (often at the end of the previous infill).:s_seam_position
 #		setting:tags$Expert:label_width$12:sidetext_width$0:seam_position
 		setting:tags$Advanced$Expert$SuSi:width$3:sidetext_width$0:seam_angle_cost
 		setting:tags$Advanced$Expert$SuSi:width$3:sidetext_width$0:seam_travel_cost