From 7dd593bb8323f324de1b8a5873f460ff6f47e33c Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Mon, 23 Dec 2024 23:12:05 -0500
Subject: [PATCH] rename 3d stack to fixed - repurpose for drag knife, etc

---
 src/kiri-mode/laser/driver.js | 2 ++
 src/kiri/conf.js              | 9 ++++++---
 src/kiri/init.js              | 4 ++--
 web/kiri/lang/en.js           | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/kiri-mode/laser/driver.js b/src/kiri-mode/laser/driver.js
index 1f304428..68c7bd4f 100644
--- a/src/kiri-mode/laser/driver.js
+++ b/src/kiri-mode/laser/driver.js
@@ -300,6 +300,8 @@ async function prepare(widgets, settings, update) {
     for (let widget of widgets) {
         if (process.ctOutStack) {
             // 3d stack output, no merging or layout
+            for (let slice of widget.slices) {
+            }
         } else if (process.ctOutMerged) {
             // slice stack merging, no layout
             // there are no inner vs outer polys
diff --git a/src/kiri/conf.js b/src/kiri/conf.js
index 2ccd016d..26c74591 100644
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@@ -666,7 +666,8 @@ const conf = exports({
                 outputInvertY: false,
                 ctOutKnifeDepth: 1,
                 ctOutKnifePasses: 1,
-                ctOutKnifeTip: 2
+                ctOutKnifeTip: 2,
+                ctOutStack: true,
             },
         },
         wjet: {
@@ -709,7 +710,8 @@ const conf = exports({
                 outputInvertY: false,
                 ctOutKnifeDepth: 1,
                 ctOutKnifePasses: 1,
-                ctOutKnifeTip: 2
+                ctOutKnifeTip: 2,
+                ctOutStack: false,
             },
         },
         wedm: {
@@ -750,7 +752,8 @@ const conf = exports({
                 ctOriginOffX: 0,
                 ctOriginOffY: 0,
                 outputInvertX: false,
-                outputInvertY: false
+                outputInvertY: false,
+                ctOutStack: false,
             }
         }
     },
diff --git a/src/kiri/init.js b/src/kiri/init.js
index b7b8eebf..a54106fb 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1267,8 +1267,8 @@ gapp.register("kiri.init", (root, exports) => {
             ctOutZColor:         newBoolean(LANG.ou_layo_s, onBooleanClick, { title:LANG.ou_layo_l, modes:TWONED, show:() => !ui.ctOutMerged.checked }),
             ctOutLayer:          newBoolean(LANG.ou_layr_s, onBooleanClick, { title:LANG.ou_layr_l, modes:TWONED, show:() => !ui.ctOutStack.checked }),
             ctOutMark:           newBoolean(LANG.ou_lays_s, onBooleanClick, { title:LANG.ou_lays_l, modes:TWONED, show:() => !ui.ctOutStack.checked }),
-            separator:           newBlank({ class:"set-sep", driven, modes:[LASER] }),
-            ctOutStack:          newBoolean(LANG.ou_stak_s, onBooleanClick, { title:LANG.ou_stak_l, modes:[LASER] }),
+            separator:           newBlank({ class:"set-sep", driven, modes:TWOD }),
+            ctOutStack:          newBoolean(LANG.ou_stak_s, onBooleanClick, { title:LANG.ou_stak_l, modes:TWOD }),
 
             /** SLA SETTINGS */
 
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js
index 28592d62..3a056a29 100644
--- a/web/kiri/lang/en.js
+++ b/web/kiri/lang/en.js
@@ -692,7 +692,7 @@ self.kiri.lang['en-us'] = {
     ou_lays_l:      ["mark layers for stacking. the layer above will be output in a different color which the laser can mark with a lower power. turns on layer grouping."],
     ou_drkn_s:      "drag knife",
     ou_drkn_l:      ["enable drag knife","output in gcode","cut radii are added","to corners with","cut down passes"],
-    ou_stak_s:      "3D stack",
+    ou_stak_s:      "fixed",
     ou_stak_l:      ["output is a 3D stack of 2D paths rather than packing layers flat in 2D"],
     ou_maxp_s:      "max power",
     ou_maxp_l:      ["max power value in gcode. power % from settings will scale from 0 to this value"],