diff options
Diffstat (limited to 'resources/ui_layout/default/print.as')
-rw-r--r-- | resources/ui_layout/default/print.as | 27 |
1 files changed, 19 insertions, 8 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); |