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

fix erroneous tab match in cpu contouring

Browse source
This commit is contained in:
Stewart Allen 2025-12-22 13:54:20 -05:00
commit ee81026455
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kiri/mode/cam/topo3.js
View file

@ -33,7 +33,7 @@ export class Topo {
minY = bounds.min.y, minY = bounds.min.y,
maxY = bounds.max.y, maxY = bounds.max.y,
zBottom = contour.bottom ? workarea.bottom_z : 0, zBottom = contour.bottom ? workarea.bottom_z : 0,
zMin = workarea.bottom_z + 0.0001, //Math.max(bounds.min.z, zBottom) + 0.0001, zMin = workarea.bottom_z + 0.0001,
boundsX = maxX - minX, boundsX = maxX - minX,
boundsY = maxY - minY, boundsY = maxY - minY,
inside = contour.inside, inside = contour.inside,
@ -474,7 +474,8 @@ export class Topo {
...params, ...params,
box, box,
lines: rec.lines, lines: rec.lines,
gridx: rec.index gridx: rec.index,
slice
}); });
return slice; return slice;
@ -657,7 +658,6 @@ export class Probe {
let iy = Math.round(ry * (py - minY)); let iy = Math.round(ry * (py - minY));
return data[ix * stepsY + iy] || zMin; return data[ix * stepsY + iy] || zMin;
}; };
} }
} }
@ -848,7 +848,7 @@ export class Trace {
checkr.y = y; checkr.y = y;
// when tabs are on and this point is inside the // when tabs are on and this point is inside the
// tab polygon, ensure z is at least tabHeight // tab polygon, ensure z is at least tabHeight
if (clipTab && tv < tabHeight && inClip(clipTab, tv, checkr)) { if (clipTab && clipTab.length && tv < tabHeight && inClip(clipTab, tv, checkr)) {
tv = this.tabZ; tv = this.tabZ;
} }
// if the value is on the floor and inside the clip // if the value is on the floor and inside the clip
@ -886,7 +886,7 @@ export class Trace {
checkr.y = y; checkr.y = y;
// when tabs are on and this point is inside the // when tabs are on and this point is inside the
// tab polygon, ensure z is at least tabHeight // tab polygon, ensure z is at least tabHeight
if (clipTab && tv < tabHeight && inClip(clipTab, tv, checkr)) { if (clipTab && clipTab.length && tv < tabHeight && inClip(clipTab, tv, checkr)) {
tv = this.tabZ; tv = this.tabZ;
} }
// if the value is on the floor and inside the clip // if the value is on the floor and inside the clip

1
src/kiri/run/minion.js
View file

@ -254,6 +254,7 @@ const funcs = self.minion = {
trace_y(data, seq) { trace_y(data, seq) {
const { trace } = cache.trace; const { trace } = cache.trace;
trace.crossY_sync(data.params, slice => { trace.crossY_sync(data.params, slice => {
// console.log('w',slice);
slice = codec.encode(slice); slice = codec.encode(slice);
reply({ seq, slice }); reply({ seq, slice });
}); });