more small bugixes

This commit is contained in:
bakedpotatolord 2025-04-27 09:00:33 -06:00
commit 51e2ac5e88

View file

@ -1483,6 +1483,9 @@ class OpDrill extends CamOp {
// drill points to use center (average of all points) of the polygon // drill points to use center (average of all points) of the polygon
allDrills.forEach((drill)=> { allDrills.forEach((drill)=> {
if(!drill.selected){
return
}
let slice = newSlice(0); let slice = newSlice(0);
if (op.mark) { if (op.mark) {
// replace depth with single down peck // replace depth with single down peck
@ -1495,11 +1498,10 @@ class OpDrill extends CamOp {
if ((op.thru>0) ) { if ((op.thru>0) ) {
drill.zBottom -= op.thru; drill.zBottom -= op.thru;
} }
console.log(slice)
const poly = newPolygon() const poly = newPolygon()
poly.points.push({x:drill.x, y:drill.y, z:drill.z}) poly.points.push(newPoint(drill.x, drill.y, drill.z))
poly.points.push({x:drill.x, y:drill.y, z:drill.zBottom}) poly.points.push(newPoint(drill.x, drill.y, drill.zBottom))
// poly.points.pop(); // poly.points.pop();
slice.camTrace = { tool: op.tool, rate: op.feed, plunge: op.rate }; slice.camTrace = { tool: op.tool, rate: op.feed, plunge: op.rate };
@ -1515,11 +1517,12 @@ class OpDrill extends CamOp {
} }
prepare(ops, progress) { prepare(ops, progress) {
console.log("prepare drill",ops)
let { op, state } = this; let { op, state } = this;
let { settings, widget, addSlices, updateToolDiams } = state; let { settings, widget, addSlices, updateToolDiams } = state;
let { setTool, setSpindle, setDrill, emitDrills } = ops; let { setTool, setSpindle, setDrill, emitDrills } = ops;
setTool(op.tool, undefined, op.rate); setTool(op.tool, undefined, op.rate);
setDrill(op.down, op.lift, op.dwell); setDrill(op.down, op.lift, op.dwell,op.thru);
setSpindle(op.spindle); setSpindle(op.spindle);
emitDrills(this.sliceOut.map(slice => slice.camLines).flat()); emitDrills(this.sliceOut.map(slice => slice.camLines).flat());
} }