From 018f7528297130c719547a94553cec6c6238de88 Mon Sep 17 00:00:00 2001
From: stewart allen <sa@grid.space>
Date: Sat, 26 Feb 2022 22:58:38 -0500
Subject: [PATCH] line width is now a direct override for nozzle size

---
 src/kiri-mode/fdm/prepare.js |  4 ++--
 src/kiri-mode/fdm/slice.js   | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/kiri-mode/fdm/prepare.js b/src/kiri-mode/fdm/prepare.js
index a8756cc8..dfd604c1 100644
--- a/src/kiri-mode/fdm/prepare.js
+++ b/src/kiri-mode/fdm/prepare.js
@@ -41,7 +41,7 @@ FDM.prepare = function(widgets, settings, update) {
         { lineType, danger } = controller,
         printPoint = newPoint(0,0,0),
         print = self.worker.print = kiri.newPrint(settings, widgets),
-        nozzle = device.extruders[0].extNozzle,
+        nozzle = process.sliceLineWidth || device.extruders[0].extNozzle,
         isBelt = device.bedBelt,
         isThin = lineType === "line",
         isFlat = lineType === "flat",
@@ -783,7 +783,7 @@ function slicePrintPath(print, slice, startPoint, offset, output, opt = {}) {
     let preout = [],
         process = opt.params || settings.process,
         extruder = slice.extruder || 0,
-        nozzleSize = device.extruders[extruder].extNozzle,
+        nozzleSize = process.sliceLineWidth || device.extruders[extruder].extNozzle,
         firstLayer = opt.first || false,
         thinWall = nozzleSize * (opt.thinWall || 1.75),
         retractDist = opt.retractOver || 2,
diff --git a/src/kiri-mode/fdm/slice.js b/src/kiri-mode/fdm/slice.js
index 0c7e5827..397a17b2 100644
--- a/src/kiri-mode/fdm/slice.js
+++ b/src/kiri-mode/fdm/slice.js
@@ -110,8 +110,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
         extruder = parseInt(isSynth ? process.sliceSupportNozzle : metadata.extruder || 0),
         sliceHeight = process.sliceHeight,
         sliceHeightBase = (isBelt ? sliceHeight : process.firstSliceHeight) || sliceHeight,
-        nozzleSize = device.extruders[extruder].extNozzle,
-        lineWidth = process.sliceLineWidth || nozzleSize,
+        lineWidth = process.sliceLineWidth || device.extruders[extruder].extNozzle,
         fillOffsetMult = 1.0 - bound(process.sliceFillOverlap, 0, 0.8),
         shellOffset = lineWidth,
         fillSpacing = lineWidth,
@@ -144,7 +143,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
     if (!(sliceHeight > 0 && sliceHeight < 100)) {
         return ondone("invalid slice height");
     }
-    if (!(nozzleSize >= 0.01 && nozzleSize < 100)) {
+    if (!(lineWidth >= 0.01 && lineWidth < 100)) {
         return ondone("invalid nozzle size");
     }
 
@@ -520,7 +519,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
                 // by removing the forced start-point in print.js
                 addto.belt.touch = false;
                 let z = addto.z;
-                let y = z - smin - (nozzleSize / 2);
+                let y = z - smin - (lineWidth / 2);
                 let splat = base.newPolygon().add(minx, y, z).add(maxx, y, z).setOpen();
                 let snew = addto.addTop(splat).fill_sparse = [ splat ];
                 adds.push(snew);
@@ -552,7 +551,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
                         dx = (Math.floor(dx / 3) * 3) / 2;
                         let fy = first.y;
                         let fz = first.z;
-                        let n2 = nozzleSize / 2;
+                        let n2 = lineWidth / 2;
                         for (let x = mp - dx; x <= mp + dx ; x += 3) {
                             add.push( base.newPolygon().add(x, fy - n2, fz).add(x, fy + y + n2, fz).setOpen() );
                         }
@@ -649,7 +648,7 @@ FDM.slice = function(settings, widget, onupdate, ondone) {
                         resolve.push({top, offset});
                     } else {
                         let offset = [];
-                        POLY.expand(top.shells || [], -nozzleSize/4, slice.z, offset);
+                        POLY.expand(top.shells || [], -lineWidth/4, slice.z, offset);
                         fillSupportPolys(promises, offset, lineWidth, density, slice.z, isBelt);
                         resolve.push({top, offset});
                     }