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

disable arcMin arcMax and remove NaN filter

Browse source
This commit is contained in:
Stewart Allen 2021-05-31 23:25:32 -04:00
commit 2147af0cd1
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/mode/fdm/export.js
View file

@ -65,7 +65,8 @@
timeDwell = retDwell / 1000, timeDwell = retDwell / 1000,
peelGuard = process.outputPeelGuard || 0, peelGuard = process.outputPeelGuard || 0,
arcDist = isBelt || !isDanger ? 0 : (process.arcTolerance || 0), arcDist = isBelt || !isDanger ? 0 : (process.arcTolerance || 0),
arcMax = 300, arcMin = 1,
arcMax = 200,
originCenter = process.outputOriginCenter, originCenter = process.outputOriginCenter,
offset = originCenter ? null : { offset = originCenter ? null : {
x: device.bedWidth/2, x: device.bedWidth/2,
@ -539,7 +540,8 @@
dc = Math.sqrt(dx * dx + dy * dy); dc = Math.sqrt(dx * dx + dy * dy);
} }
// if new point is off the arc // if new point is off the arc
if (deem || depm || desp || dc > arcDist || cc.r >= arcMax) { // if (deem || depm || desp || dc > arcDist || cc.r < arcMin || cc.r > arcMax || dist > cc.r) {
if (deem || depm || desp || dc > arcDist || dist > cc.r) {
// console.log({dc, depm, desp}); // console.log({dc, depm, desp});
if (arcQ.length === 4) { if (arcQ.length === 4) {
// not enough points for an arc, drop first point and recalc center // not enough points for an arc, drop first point and recalc center
@ -623,7 +625,7 @@
let to = arcQ.peek(); let to = arcQ.peek();
let cc = {x:0, y:0, z:0, r:0}; let cc = {x:0, y:0, z:0, r:0};
let cl = 0; let cl = 0;
for (let center of arcQ.center.filter(rec => !isNaN(rec.r))) { for (let center of arcQ.center) {
cc.x += center.x; cc.x += center.x;
cc.y += center.y; cc.y += center.y;
cc.z += center.z; cc.z += center.z;