move overrides to top of common slice code. add support to roughing

mods/bambu/init.js

@@ -350,7 +350,7 @@ module.exports = async (server) => {
                             }
                         });
                         // request system info
-                        false && mqtt.send({
+                        mqtt.send({
                             info: {
                                 command: "get_version"
                             }

src/kiri-mode/cam/client.js

@@ -1333,6 +1333,9 @@ CAM.init = function(kiri, api) {
         voids:   'camRoughVoid',
         flats:   'camRoughFlat',
         inside:  'camRoughIn',
+        ov_topz: 0,
+        ov_botz: 0,
+        ov_conv: '~camConventional',
     }).inputs = {
         tool:    UC.newSelect(LANG.cc_tool, {}, "tools"),
         sep:     UC.newBlank({class:"pop-sep"}),
@@ -1348,7 +1351,13 @@ CAM.init = function(kiri, api) {
         all:     UC.newBoolean(LANG.cr_clst_s, undefined, {title:LANG.cr_clst_l, show:hasIndexing}),
         voids:   UC.newBoolean(LANG.cr_clrp_s, undefined, {title:LANG.cr_clrp_l}),
         flats:   UC.newBoolean(LANG.cr_clrf_s, undefined, {title:LANG.cr_clrf_l}),
-        inside:  UC.newBoolean(LANG.cr_olin_s, undefined, {title:LANG.cr_olin_l})
+        inside:  UC.newBoolean(LANG.cr_olin_s, undefined, {title:LANG.cr_olin_l}),
+        sep:      UC.newBlank({class:"pop-sep"}),
+        exp:      UC.newExpand("overrides"),
+        ov_topz:  UC.newInput(LANG.ou_ztop_s, {title:LANG.ou_ztop_l, convert:UC.toFloat, units:true}),
+        ov_botz:  UC.newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:UC.toFloat, units:true}),
+        ov_conv:  UC.newBoolean(LANG.ou_conv_s, undefined, {title:LANG.ou_conv_l}),
+        exp_end:  UC.endExpand(),
     };
 
     createPopOp('outline', {
@@ -1365,7 +1374,10 @@ CAM.init = function(kiri, api) {
         outside:  'camOutlineOut',
         inside:   'camOutlineIn',
         wide:     'camOutlineWide',
-        top:      'camOutlineTop'
+        top:      'camOutlineTop',
+        ov_topz:   0,
+        ov_botz:   0,
+        ov_conv:   '~camConventional',
     }).inputs = {
         tool:     UC.newSelect(LANG.cc_tool, {}, "tools"),
         sep:      UC.newBlank({class:"pop-sep"}),
@@ -1384,6 +1396,12 @@ CAM.init = function(kiri, api) {
         omitvoid: UC.newBoolean(LANG.co_omvd_s, undefined, {title:LANG.co_omvd_l, xshow:(op) => { return op.inputs.outside.checked }}),
         wide:     UC.newBoolean(LANG.co_wide_s, undefined, {title:LANG.co_wide_l, show:(op) => { return !op.inputs.inside.checked }}),
         dogbones: UC.newBoolean(LANG.co_dogb_s, undefined, {title:LANG.co_dogb_l, show:(op) => { return !op.inputs.wide.checked }}),
+        sep:      UC.newBlank({class:"pop-sep"}),
+        exp:      UC.newExpand("overrides"),
+        ov_topz:  UC.newInput(LANG.ou_ztop_s, {title:LANG.ou_ztop_l, convert:UC.toFloat, units:true}),
+        ov_botz:  UC.newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:UC.toFloat, units:true}),
+        ov_conv:  UC.newBoolean(LANG.ou_conv_s, undefined, {title:LANG.ou_conv_l}),
+        exp_end:  UC.endExpand(),
     };
 
     const contourFilter = gcodeEditor('Layer Filter', 'filter');

src/kiri-mode/cam/ops.js

@@ -173,7 +173,7 @@ class OpRough extends CamOp {
         let { op, state } = this;
         let { settings, slicer, addSlices, unsafe, color } = state;
         let { updateToolDiams, thruHoles, tabs, cutTabs, cutPolys } = state;
-        let { ztOff, zBottom, zMax, shadowAt, isIndexed} = state;
+        let { ztOff, zMax, shadowAt, isIndexed} = state;
         let { workarea } = state;
         let { process, stock } = settings;
 
@@ -242,7 +242,7 @@ class OpRough extends CamOp {
                 .filter(row => row[1] > flatArea)
                 .map(row => row[0])
                 .map(v => parseFloat(v).round(5))
-                .filter(v => v >= zBottom);
+                .filter(v => v >= workarea.bottom_z);
             flats.forEach(v => {
                 if (!indices.contains(v)) {
                     indices.push(v);
@@ -270,7 +270,7 @@ class OpRough extends CamOp {
             indices = indices.appendAll(flats).sort((a,b) => b-a);
         }
 
-        indices = indices.filter(v => v >= zBottom);
+        indices = indices.filter(v => v >= workarea.bottom_z);
         // console.log('indices', ...indices, {zBottom});
 
         let cnt = 0;
@@ -437,7 +437,7 @@ class OpRough extends CamOp {
         let { process } = settings;
 
         let easeDown = process.camEaseDown;
-        let cutdir = process.camConventional;
+        let cutdir = op.ov_conv;
         let depthFirst = process.camDepthFirst && !state.isIndexed;
         let depthData = [];
 
@@ -684,7 +684,7 @@ class OpOutline extends CamOp {
 
         let easeDown = process.camEaseDown;
         let toolDiam = this.toolDiam;
-        let cutdir = process.camConventional;
+        let cutdir = op.ov_conv;//process.camConventional;
         let depthFirst = process.camDepthFirst;
         let depthData = [];
 
@@ -962,11 +962,6 @@ class OpTrace extends CamOp {
         if (state.isIndexed) {
             throw 'trace op not supported with indexed stock';
         }
-        // apply overrides
-        workarea.recalc({
-            top_z: ov_topz,
-            bottom_z: ov_botz
-        });
         // generate tracing offsets from chosen features
         let zTop = workarea.top_z;
         let zBottom = workarea.bottom_z;
@@ -1203,11 +1198,6 @@ class OpPocket extends CamOp {
         let { settings, widget, addSlices, zBottom, zThru, tabs, color } = state;
         let { updateToolDiams, cutTabs, healPolys, shadowAt, workarea } = state;
         let { process } = settings;
-        // apply overrides
-        workarea.recalc({
-            top_z: ov_topz,
-            bottom_z: ov_botz
-        });
         zBottom = ov_botz ? workarea.bottom_stock + ov_botz : zBottom;
         // generate tracing offsets from chosen features
         let sliceOut;

src/kiri-mode/cam/slice.js

@@ -67,7 +67,7 @@ CAM.slice = async function(settings, widget, onupdate, ondone) {
         bottom_stock = -bottom_gap,
         bottom_thru = zThru,
         bottom_z = Math.max(
-            (camZBottom ? bottom_stock + proc.camZBottom : bottom_part) - bottom_thru,
+            (camZBottom ? bottom_stock + camZBottom : bottom_part) - bottom_thru,
             (camZBottom ? bottom_stock + camZBottom : bottom_stock - bottom_thru)
         ),
         bottom_cut = Math.max(bottom_z, -zThru),
@@ -84,12 +84,7 @@ CAM.slice = async function(settings, widget, onupdate, ondone) {
             bottom_part,
             bottom_gap,
             bottom_z,
-            bottom_cut,
+            bottom_cut
-            recalc(val) {
-                if (val.top_z) workarea.top_z = bottom_stock + val.top_z;
-                if (val.bottom_z) workarea.bottom_z = bottom_stock + val.bottom_z;
-                if (val.bottom_z) workarea.bottom_cut = Math.max(workarea.bottom_z, -zThru)
-            }
         }, 3);
 
     // console.table({ workarea });
@@ -240,7 +235,7 @@ CAM.slice = async function(settings, widget, onupdate, ondone) {
         unsafe,
         color,
         dark,
-        workarea
+        // workarea
     };
 
     let opList = [
@@ -273,9 +268,19 @@ CAM.slice = async function(settings, widget, onupdate, ondone) {
 
     // call slice() function on all ops in order
     let tracker = setSliceTracker({ rotation: 0 });
+    let workarea_orig = structuredClone(workarea);
     setAxisIndex();
     for (let op of opList) {
         let weight = op.weight();
+        // apply operation override vars
+        let workover = structuredClone(workarea_orig);
+        let valz = op.op;
+        if (valz.ov_topz) workover.top_z = bottom_stock + valz.ov_topz;
+        if (valz.ov_botz) {
+            workover.bottom_z = bottom_stock + valz.ov_botz;
+            workover.bottom_cut = Math.max(workover.bottom_z, -zThru);
+        }
+        state.workarea = workover;
         await op.slice((progress, message) => {
             onupdate((opSum + (progress * weight)) / opTot, message || op.type());
         });