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

tweaks to arc work

Browse source
This commit is contained in:
Stewart Allen 2021-02-06 12:11:54 -05:00
commit 1e33774630
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/kiri/print.js
View file

@ -150,11 +150,12 @@
rec[tok.charAt(0)] = parseFloat(tok.substring(1)); rec[tok.charAt(0)] = parseFloat(tok.substring(1));
}); });
let center = { x:0, y:0 }; let center = { x:0, y:0, r:0 };
if (rec.I !== undefined && rec.J !== undefined) { if (rec.I !== undefined && rec.J !== undefined) {
center.x = pos.X + rec.I; center.x = pos.X + rec.I;
center.y = pos.Y + rec.J; center.y = pos.Y + rec.J;
//center.r = TODO
} else if (rec.R !== undefined) { } else if (rec.R !== undefined) {
let mid = { let mid = {
x: (pos.X + rec.X) / 2, x: (pos.X + rec.X) / 2,
@ -174,6 +175,7 @@
LOG({hml,s2,ln,mid}); LOG({hml,s2,ln,mid});
center.x = mid.x - ln * s2.dx; center.x = mid.x - ln * s2.dx;
center.y = mid.y - ln * s2.dy; center.y = mid.y - ln * s2.dy;
center.r = rec.R;
} else { } else {
console.log({malfomed_arc: line}); console.log({malfomed_arc: line});
} }
@ -192,22 +194,25 @@
LOG({pos, rec, center, a1, a2, ad, d1, d2, step, rot}); LOG({pos, rec, center, a1, a2, ad, d1, d2, step, rot});
G0G1(false, [`X${center.x}`, `Y${center.y}`, `E1`]); G0G1(false, [`X${center.x}`, `Y${center.y}`, `E1`]);
G0G1(false, [`X${rec.X}`, `Y${rec.Y}`, `E1`]);
// rotate p around o // rotate p around o
// p'x = cos(theta) * (px-ox) - sin(theta) * (py-oy) + ox // p'x = cos(theta) * (px-ox) - sin(theta) * (py-oy) + ox
// p'y = sin(theta) * (px-ox) + cos(theta) * (py-oy) + oy // p'y = sin(theta) * (px-ox) + cos(theta) * (py-oy) + oy
let pc = { X: pos.X, Y: pos.Y }; let pc = { X: pos.X, Y: pos.Y };
// let zc = { x: pc.X - center.x, y: pc.Y - center.y };
for (let i=0; i<=steps; i++) { for (let i=0; i<=steps; i++) {
let np = { let np = {
X: Math.cos(rot) * (pc.X - center.x) - Math.sin(rot) * (pc.Y - center.y) + center.x, X: center.x + Math.sin(rot) * center.r,
Y: Math.sin(rot) * (pc.X - center.x) - Math.cos(rot) * (pc.Y - center.y) + center.y Y: center.y + Math.cos(rot) * center.r
// X: Math.cos(rot) * (pc.X - center.x) - Math.sin(rot) * (pc.Y - center.y) + center.x,
// Y: Math.sin(rot) * (pc.X - center.x) - Math.cos(rot) * (pc.Y - center.y) + center.y
}; };
rot += step; rot += step;
// G0G1(false, [`X${np.X}`, `Y${np.Y}`, `E1`]); G0G1(false, [`X${np.X}`, `Y${np.Y}`, `E1`]);
} }
G0G1(false, [`X${rec.X}`, `Y${rec.Y}`, `E1`]);
LOG({g2, arc: line, pos, center}); LOG({g2, arc: line, pos, center});
pos.X = rec.X; pos.X = rec.X;