AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add drills to rec, and fix slicing

Browse source
This commit is contained in:
bakedpotatolord 2025-04-27 08:08:01 -06:00
commit 1a00278bce
2 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/kiri-mode/cam/client.js
View file

@ -400,7 +400,9 @@ CAM.init = function(kiri, api) {
};
func.opAddDrill = () => {
func.opAdd(popOp.drill.new());
let rec = popOp.drill.new();
rec.drills = { /* widget.id: [ drills... ] */ };
func.opAdd(rec);
};
func.opAddRegister = (axis, points) => {
@ -1190,6 +1192,13 @@ CAM.init = function(kiri, api) {
api.hide.alert(alert);
alert = api.show.alert("[esc] cancels trace editing");
kiri.api.widgets.opacity(0.8);
holes.toRecord = () => {
return holes.map(hole => {
let {x,y,z,depth,selected} = hole
return {x,y,z,depth,selected}
})
}
if (!holes.length) {
unselectHoles(holes);
@ -1214,6 +1223,10 @@ CAM.init = function(kiri, api) {
hole.updateColor()
}
})
//add hole data to record
poppedRec.drills[widget.id] = holes.toRecord();
widget.holes.forEach(hole => {
widget.mesh.add(hole.mesh);
widget.adds.push(hole.mesh);
@ -1264,6 +1277,9 @@ CAM.init = function(kiri, api) {
if (!int) return; //if not a hole mesh return
let { object } = int;
func.selectHoleToggle(object.hole);
let widget = object.parent.widget; //only update the parent widget
poppedRec.drills[widget.id] = widget.holes.toRecord();
}

51
src/kiri-mode/cam/ops.js
View file

@ -1463,47 +1463,52 @@ class OpDrill extends CamOp {
let { op, state } = this;
let { settings, addSlices, widget, updateToolDiams } = state;
let { zBottom, zThru, thruHoles, color } = state;
let { drills, drillThrough} = op
let drills = [],
drillTool = new CAM.Tool(settings, op.tool),
let drillTool = new CAM.Tool(settings, op.tool),
drillToolDiam = drillTool.fluteDiameter(),
sliceOut = this.sliceOut = [];
updateToolDiams(drillToolDiam);
console.log(widget)
const allDrills = Object.values(drills).flat();
console.log("drills",allDrills)
console.log("op",op)
// for each slice, look for polygons with 98.5% circularity whose
// area is within the tolerance of a circle matching the tool diameter
// drill points to use center (average of all points) of the polygon
drills.forEach(function(drill) {
let center = drill.center(true),
slice = newSlice(0,null);
allDrills.forEach((drill)=> {
let slice = newSlice(0);
if (op.mark) {
// replace points with single mark
let points = drill.points;
points = [
points[0],
points[0].clone().sub({x:0, y:0, z:op.down})
];
drill.points = points;
// replace depth with single down peck
drill.depth = op.down
}
drill.points.forEach(function(point) {
point.x = center.x;
point.y = center.y;
});
drill.zBottom = drill.z - drill.depth;
// for thru holes, follow z thru when set
if ((op.thru>0) && center.isInPolygon(thruHoles)) {
drill.points.push(drill.points.last().sub({x:0,y:0,z:op.thru}));
}else if(zThru && center.isInPolygon(thruHoles)){
drill.points.push(drill.points.last().sub({x:0,y:0,z:zThru}));
if ((op.thru>0) ) {
drill.zBottom -= op.thru;
}
slice.camLines = [ drill ];
console.log(slice)
const poly = newPolygon()
poly.points.push({x:drill.x, y:drill.y, z:drill.z})
poly.points.push({x:drill.x, y:drill.y, z:drill.zBottom})
// poly.points.pop();
slice.camTrace = { tool: op.tool, rate: op.feed, plunge: op.rate };
slice.camLines = [poly];
console.log("cam line",slice.camLines)
slice.output()
.setLayer("drill", {face: color, line: color})
.addPolys(drill);
.addPolys(slice.camLines);
addSlices(slice);
sliceOut.push(slice);
});