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

Merge pull request #358 from bakedPotatoLord/improved-drill-op

Browse source 
fix bugs in drill op, and add shadow detection
This commit is contained in:
Stewart Allen 2025-05-03 17:51:29 -07:00 • committed by GitHub
commit cb10d9164b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 59 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1190,9 +1190,7 @@ CAM.init = function(kiri, api) {
const {tool,mark} = poppedRec //TODO: display some visual difference if mark is selected
let diam = new CAM.Tool(settings,tool).fluteDiameter()
api.hide.alert(alert);
alert = api.show.alert("[esc] cancels drill editing");
kiri.api.widgets.opacity(0.8);
const widgets = kiri.api.widgets.all()
/**
* creates a mesh for a hole and adds it to a widget
@ -1242,10 +1240,16 @@ CAM.init = function(kiri, api) {
}else{ // if no widget has cached holes
await CAM.holes(individual?0:diam,(centers)=>{
let shadow = centers.some(c=>c.shadowed)
if(shadow){
alert = api.show.alert("Some holes are shadowed by part and are not shown.");
}
centers = centers ?? []
//flattened list of all hole centers and if they are selected
kiri.api.widgets.for(widget => {
const {holes} = centers.find(center=>center.id = widget.id)
console.log(holes)
if (!holes.length) unselectHoles(holes);
holes.forEach(hole => {
createHoleMesh(widget, hole)
@ -1260,6 +1264,10 @@ CAM.init = function(kiri, api) {
})
});
}
//hide the alert once hole meshes are calculated on the worker, and then added to the scene
api.hide.alert(alert);
alert = api.show.alert("[esc] cancels drill editing");
kiri.api.widgets.opacity(0.8);
}
func.selectHolesHover = function(data) {

1
src/kiri-mode/cam/driver.js
View file

@ -168,6 +168,7 @@ kiri.load(api => {
send.done(kiri.codec.encode(fresh.map(widget => { return {
id: widget.id,
holes: widget.holes,
shadowed:widget.shadowedDrills
} } )));
}
}

81
src/kiri-mode/cam/slice.js
View file

@ -460,14 +460,20 @@ CAM.holes = async function(settings, widget, diam) {
// keeps the z bottom relative to the part when z align changes
zBottom = isIndexed ? camZBottom : camZBottom - zbOff;
let slicer = new kiri.cam_slicer(widget);
let zees = Object.assign({}, slicer.zFlat);
let indices = [...new Set(Object.keys(zees)
let slicerOpts = {flatoff: 0.01}
let slicer = new kiri.cam_slicer(widget,slicerOpts);
let zFlats = Object.keys(slicer.zFlat).map(Number).map(z=>[z]).flat()
let intervals = slicer.interval(1,{
fit: false, off: -0.01, flats: true
})
let zees = [...zFlats,...intervals]
let indices = [...new Set(zees
.map(kv => parseFloat(kv).round(5))
.filter(z => z !== null)
)]
let centerDiff = diam * 0.1,
area = (diam/2) * (diam/2) * Math.PI,
areaDelta = area * 0.05,
@ -478,45 +484,52 @@ CAM.holes = async function(settings, widget, diam) {
function onEach(slice) {
slices.push(slice);
}
let opts = { each: onEach, over: false, flatoff: 0, edges: true, openok: false, lines: false };
let opts = { each: onEach };
await slicer.slice(indices, opts);
const tslices = slices.map(s=>s.tops).flat()
// console.log("tslices",tslices)
for (let slice of tslices) {
slice.shadow = CAM.shadowAt(widget,slice.z, 0)
let inner = slice.inner;
if (!inner) { //no holes
continue;
}
for (let poly of inner) {
let center = poly.calcCircleCenter();
center.selected = (!individual && poly.circularity() >= 0.985 && Math.abs(poly.area() - area) <= areaDelta );
if (center.isInPolygon(slice.shadow)) {
//TODO: this does not work yet. needs to be implemented
let shadowedDrills = false;
// console.log("slices",slices)
for (let slice of slices) {
for(let top of slice.tops){
// console.log("slicing",slice.z,top)
slice.shadow = CAM.shadowAt(widget,slice.z, 0)
let inner = top.inner;
if (!inner) { //no holes
continue;
}
let overlap = false;
for (let [i,drill] of drills.entries()) {
let dist = drill.distTo2D(center)
if (dist <= centerDiff) { // too close
// console.log("overlap",center,drill);
if(center.z > drill.z) { //if current is higher than old
drills[i] = center; //replace with top point
drills[i].depth = center.z-drill.z
}else if(center.z <= drill.z-drill.depth){// if current is lower or same as old
drills[i].depth = drill.z-center.z
}
// if overlapping, don't add and continue
overlap = true;
for (let poly of inner) {
let center = poly.calcCircleCenter();
center.area = poly.area();
// console.log("center",center)
center.selected = (!individual && poly.circularity() >= 0.985 && Math.abs(center.area - area) <= areaDelta );
if (center.isInPolygon(slice.shadow)) {
// if shadowed, don't add, and inform client
shadowedDrills = true;
continue;
}
let overlap = false;
for (let [i,drill] of drills.entries()) {
let dist = drill.distTo2D(center)
//if on the same xy point, and both have the same selection value
if (dist <= centerDiff && drill.selected == center.selected) {
// console.log("overlap",center,drill);
if(center.z > drill.z) { //if current is higher than old
drills[i] = center; //replace with top point
drills[i].depth = center.z-drill.z
}else if(center.z <= drill.z-drill.depth){// if current is lower or same as old
drills[i].depth = drill.z-center.z
}
// if overlapping, don't add and continue
overlap = true;
continue;
}
}
center.depth = 0;
if(!overlap) drills.push(center);
}
center.depth = 0;
if(!overlap) drills.push(center);
}
}
drills = drills.filter(drill => drill.depth > 0)
widget.shadowedDrills = shadowedDrills
widget.holes = drills;
return drills;
}