From f6f1d2478e85b449b2ffbf1ee59581d9f296eecb Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Thu, 13 Jun 2024 22:31:59 -0400
Subject: [PATCH] restrict ctOrigin offsets to ctOriginBounds

---
 src/kiri-mode/laser/driver.js | 2 +-
 src/kiri/conf.js              | 7 ++-----
 src/kiri/init.js              | 6 +++---
 src/kiri/platform.js          | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/kiri-mode/laser/driver.js b/src/kiri-mode/laser/driver.js
index c0237143..6430b47c 100644
--- a/src/kiri-mode/laser/driver.js
+++ b/src/kiri-mode/laser/driver.js
@@ -447,7 +447,7 @@ function exportElements(settings, output, onpre, onpoly, onpost, onpoint, onlaye
         last,
         point,
         poly = [],
-        off = {x:ctOriginOffX||0, y:ctOriginOffY||0},
+        off = ctOriginBounds ? {x:ctOriginOffX||0, y:ctOriginOffY||0} : {x:0, y:0},
         min = {x:0, y:0},
         max = {x:0, y:0},
         size = {w:0, h:0};
diff --git a/src/kiri/conf.js b/src/kiri/conf.js
index 05ab2874..e645a4b8 100644
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@@ -769,12 +769,9 @@ const conf = exports({
                 ctOriginCenter: false,
                 ctOriginBounds: true,
                 ctOriginOffX: 0,
-                ctOriginOffY: -10,
+                ctOriginOffY: 0,
                 outputInvertX: false,
-                outputInvertY: false,
-                ctOutKnifeDepth: 1,
-                ctOutKnifePasses: 1,
-                ctOutKnifeTip: 2
+                outputInvertY: false
             }
         }
     },
diff --git a/src/kiri/init.js b/src/kiri/init.js
index 1e839e6e..f57ad951 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1970,9 +1970,9 @@ gapp.register("kiri.init", [], (root, exports) => {
             separator:           newBlank({ class:"set-sep", driven }),
             ctOriginBounds:      newBoolean(LANG.or_bnds_s, onBooleanClick, {title:LANG.or_bnds_l, show:() => !ui.ctOriginCenter.checked}),
             ctOriginCenter:      newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, show:() => !ui.ctOriginBounds.checked}),
-            separator:           newBlank({ class:"set-sep", driven, modes:WEDM }),
-            ctOriginOffX:        newInput(LANG.or_offx_s, {title:LANG.or_offx_l, convert:toFloat, modes:WEDM}),
-            ctOriginOffY:        newInput(LANG.or_offy_s, {title:LANG.or_offy_l, convert:toFloat, modes:WEDM}),
+            separator:           newBlank({ class:"set-sep", driven, modes:WEDM, show:() => ui.ctOriginBounds.checked }),
+            ctOriginOffX:        newInput(LANG.or_offx_s, {title:LANG.or_offx_l, convert:toFloat, modes:WEDM, show:() => ui.ctOriginBounds.checked}),
+            ctOriginOffY:        newInput(LANG.or_offy_s, {title:LANG.or_offy_l, convert:toFloat, modes:WEDM, show:() => ui.ctOriginBounds.checked}),
             separator:           newBlank({ class:"set-sep", driven, modes:TWONED }),
             ctOutZColor:         newBoolean(LANG.ou_layo_s, onBooleanClick, {title:LANG.ou_layo_l, modes:TWONED, show:() => { return ui.ctOutMerged.checked === false }}),
             ctOutLayer:          newBoolean(LANG.ou_layr_s, onBooleanClick, {title:LANG.ou_layr_l, modes:TWONED}),
diff --git a/src/kiri/platform.js b/src/kiri/platform.js
index 97b73613..872b7b64 100644
--- a/src/kiri/platform.js
+++ b/src/kiri/platform.js
@@ -100,7 +100,7 @@ function platformUpdateOrigin(update_bounds = true) {
     }
 
     //  WireEDM origin offsets
-    if (MODE === MODES.WEDM) {
+    if (MODE === MODES.WEDM && process.ctOriginBounds) {
         origin.x -= process.ctOriginOffX;
         origin.y += process.ctOriginOffY;
     }