From 800f4300e739367e023f00d5abfec09a15a0bc96 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 17 Nov 2021 21:08:37 -0500
Subject: [PATCH] tweak tower fill. remove anchors from all but leading widget.
 clarify hover/text on skirt

---
 src/mode/fdm/prepare.js | 7 +++----
 src/mode/fdm/slice.js   | 9 +++++++++
 web/kiri/lang/en.js     | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/mode/fdm/prepare.js b/src/mode/fdm/prepare.js
index 24eab71b..663b17da 100644
--- a/src/mode/fdm/prepare.js
+++ b/src/mode/fdm/prepare.js
@@ -44,7 +44,6 @@
             layerno = 0,
             zoff = 0,
             layerout = [],
-            // slices = [],
             print = self.worker.print = KIRI.newPrint(settings, widgets),
             beltfact = Math.cos(Math.PI/4);
 
@@ -274,7 +273,7 @@
             }
         }
 
-        function mkrec(i, angle = 45) {
+        function mkrec(i, angle = 45, thin = 6) {
             blokpos.x += walkpos.x * i;
             blokpos.y += walkpos.y * i;
             let exi = device.extruders[i],
@@ -286,7 +285,7 @@
                 ], angle, noz)),
                 sparse = linesToPoly(POLY.fillArea([
                     newPolygon().centerRectangle(pos, blok.x - noz, blok.y - noz)
-                ], angle + 90, noz * 5)),
+                ], angle + 90, noz * thin)),
                 rec = {
                     extruder: i,
                     diameter: exi.extNozzle,
@@ -343,7 +342,7 @@
                 if (isBelt && z < 0) {
                     let scale = 1 + ((z / blokw));
                     mkblok(blokw * scale, blokh);
-                    rec = mkrec(rec.extruder, 0);
+                    rec = mkrec(rec.extruder, 0, 10);
                 }
                 let box = rec.rect.clone().setZ(z);
                 let fill = (z >= 0 && purgeOn ? rec.full : rec.sparse).clone().setZ(z);
diff --git a/src/mode/fdm/slice.js b/src/mode/fdm/slice.js
index ecaf937b..199e47dd 100644
--- a/src/mode/fdm/slice.js
+++ b/src/mode/fdm/slice.js
@@ -98,6 +98,15 @@
 
     FDM.sliceAll = function(settings, onupdate) {
         // future home of brim and anchor generation
+        let widgets = Object.values(KIRI.worker.cache).sort((a,b) => {
+            return a.slices[0].z - b.slices[0].z
+        });
+        // ignore first widget
+        widgets.shift();
+        // remove anchor slices from other widgets
+        for (let w of widgets) {
+            w.slices = w.slices.filter(s => s.index >= 0);
+        }
     };
 
     /**
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js
index 410c5c14..85beceb9 100644
--- a/web/kiri/lang/en.js
+++ b/web/kiri/lang/en.js
@@ -345,7 +345,7 @@ kiri.lang['en-us'] = {
     fl_skrt_s:      "skirt count",
     fl_skrt_l:      ["number of first-layer offset","brims to generate"],
     fl_skro_s:      "skirt offset",
-    fl_skro_l:      ["skirt offset from part","in millimeters"],
+    fl_skro_l:      ["skirt offset from part","in millimeters","when rafts are used","this is the raft offset"],
     fl_nozl_s:      "nozzle temp",
     fl_nozl_l:      ["degrees in celsius","output setting used","when this is zero"],
     fl_bedd_s:      "bed temp",