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

make arc generation more robust, and give up fighting with sliceOutput

Browse source
This commit is contained in:
bakedpotatolord 2025-06-18 20:14:48 -06:00
commit 1071e07b99
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/kiri-mode/cam/prepare.js
View file

@ -341,6 +341,8 @@ function prepEach(widget, settings, print, firstPoint, update) {
* @param {number} opts.factor speed scale factor * @param {number} opts.factor speed scale factor
*/ */
function camOut(point, emit,opts) { function camOut(point, emit,opts) {
// console.log({point, emit, opts})
let { let {
center = {}, center = {},
clockwise = true, clockwise = true,
@ -544,8 +546,11 @@ function prepEach(widget, settings, print, firstPoint, update) {
if (depthFirst) { if (depthFirst) {
depthData.push(polys); depthData.push(polys);
} else { } else {
poly2polyEmit(polys, printPoint, (poly, index, count)=> { printPoint = poly2polyEmit(polys, printPoint, function(poly, index, count) {
printPoint =polyEmit(poly, index, count,printPoint); poly.forEachPoint(function(point, pidx, points, offset) {
// scale speed of first cutting poly since it engages the full bit
camOut(point.clone(), offset !== 0, undefined, count === 1 ? engageFactor : 1);
}, poly.isClosed(), index);
}, { swapdir: false }); }, { swapdir: false });
newLayer(); newLayer();
} }
@ -739,12 +744,13 @@ function prepEach(widget, settings, print, firstPoint, update) {
*/ */
function polyEmit(poly, index, count, fromPoint) { function polyEmit(poly, index, count, fromPoint) {
//arcTolerance is the allowable distance between circle centers //arcTolerance is the allowable distance between circle centers
let arcRes = toRadians(5), //5 degs max let arcRes = toRadians(2), //5 degs max
arcMax = Infinity, // no max arc radius arcMax = Infinity, // no max arc radius
lineTolerance = 0.001; // do not consider points under 0.001mm for lines lineTolerance = 0.001; // do not consider points under 0.001mm for lines
fromPoint = fromPoint || printPoint; fromPoint = fromPoint || printPoint;
let arcQ = []; let arcQ = [];
arcQ.angle = []
let closest = poly.findClosestPointTo(fromPoint); let closest = poly.findClosestPointTo(fromPoint);
let lastPoint = closest.point; let lastPoint = closest.point;
@ -790,7 +796,6 @@ function prepEach(widget, settings, print, firstPoint, update) {
} }
function arcExport(point,lastp){ function arcExport(point,lastp){
// console.log("start",point,lastp)
let dist = lastp? point.distTo2D(lastp) : 0; let dist = lastp? point.distTo2D(lastp) : 0;
if (lastp) { if (lastp) {
if (dist >lineTolerance && lastp) { if (dist >lineTolerance && lastp) {
@ -813,19 +818,12 @@ function prepEach(widget, settings, print, firstPoint, update) {
if (lr) { if (lr) {
let angle = 2 * Math.asin(dist/(2*lr.r)); let angle = 2 * Math.asin(dist/(2*lr.r));
radFault = Math.abs(angle) > arcRes; // enforce arcRes(olution) radFault = Math.abs(angle) > arcRes; // enforce arcRes(olution)
if(radFault){
console.log({angle, arcRes, dist, lr,radFault});
}
// if (arcQ.center) {
// arcQ.rSum = arcQ.center.reduce( function (t, v) { return t + v.r }, 0 );
// let avg = arcQ.rSum / arcQ.center.length;
// radFault = radFault || Math.abs(avg - lr.r) / avg > arcDev; // eliminate sharps and flats when local rad is out of arcDev(iation)
// }
} else { } else {
radFault = true; radFault = true;
console.log("too much angle") console.log("too much angle")
} }
if (cc) { if (cc) {
if ([cc.x,cc.y,cc.z,cc.r].hasNaN()) { if ([cc.x,cc.y,cc.z,cc.r].hasNaN()) {
@ -836,6 +834,17 @@ function prepEach(widget, settings, print, firstPoint, update) {
arcQ.xSum = cc.x; arcQ.xSum = cc.x;
arcQ.ySum = cc.y; arcQ.ySum = cc.y;
arcQ.rSum = cc.r; arcQ.rSum = cc.r;
// check if first angles should have caused radFault
let a = toRadians(arcQ[0].slopeTo(cc).angle)
let b = toRadians(arcQ[1].slopeTo(cc).angle)
let angle = Math.abs(b-a)
if( Math.abs(angle) > arcRes){
// if so, remove first point
camOut(arcQ.shift(), 1)
radFault = true
}
} else { } else {
// check center point delta // check center point delta
arcQ.xSum = arcQ.center.reduce( function (t, v) { return t + v.x }, 0 ); arcQ.xSum = arcQ.center.reduce( function (t, v) { return t + v.x }, 0 );
@ -867,7 +876,6 @@ function prepEach(widget, settings, print, firstPoint, update) {
} else { } else {
// enough to consider an arc, emit and start new arc // enough to consider an arc, emit and start new arc
let defer = arcQ.pop(); let defer = arcQ.pop();
console.log("draining",defer, structuredClone(arcQ),arcQ.length);
drainQ(); drainQ();
// re-add point that was off the last arc // re-add point that was off the last arc
arcQ.push(defer); arcQ.push(defer);
@ -924,7 +932,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
arcQ.ySum / cl, arcQ.ySum / cl,
) )
if(arcQ.length == poly.points.length){ if(arcQ.length == poly.points.length ){
//if is a circle //if is a circle
// generate circle // generate circle
// console.log("circle",{from, to,center}); // console.log("circle",{from, to,center});