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

correct dogbone angles. handle inner polys

Browse source
This commit is contained in:
Stewart Allen 2020-12-03 21:14:52 -05:00
commit 79b09ee73c
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/init.js
View file

@ -1594,7 +1594,7 @@
camOutlineDown: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, modes:CAM, units:true}), camOutlineDown: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, modes:CAM, units:true}),
camOutlineSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM, units:true}), camOutlineSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM, units:true}),
camOutlinePlunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, modes:CAM, units:true}), camOutlinePlunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, modes:CAM, units:true}),
camOutlineDogbone: UC.newBoolean(LANG.co_dogb_s, onBooleanClick, {title:LANG.co_dogb_l, modes:CAM}), camOutlineDogbone: UC.newBoolean(LANG.co_dogb_s, onBooleanClick, {title:LANG.co_dogb_l, modes:CAM, show:() => { return !UI.camOutlineWide.checked }}),
camOutlineIn: UC.newBoolean(LANG.co_olin_s, onBooleanClick, {title:LANG.co_olin_l, modes:CAM, show:() => { return !UI.camOutlineOut.checked }}), camOutlineIn: UC.newBoolean(LANG.co_olin_s, onBooleanClick, {title:LANG.co_olin_l, modes:CAM, show:() => { return !UI.camOutlineOut.checked }}),
camOutlineOut: UC.newBoolean(LANG.co_olot_s, onBooleanClick, {title:LANG.co_olot_l, modes:CAM, show:() => { return !UI.camOutlineIn.checked }}), camOutlineOut: UC.newBoolean(LANG.co_olot_s, onBooleanClick, {title:LANG.co_olot_l, modes:CAM, show:() => { return !UI.camOutlineIn.checked }}),
camOutlineWide: UC.newBoolean(LANG.co_wide_s, onBooleanClick, {title:LANG.co_wide_l, modes:CAM, show:() => { return !UI.camOutlineIn.checked }}), camOutlineWide: UC.newBoolean(LANG.co_wide_s, onBooleanClick, {title:LANG.co_wide_l, modes:CAM, show:() => { return !UI.camOutlineIn.checked }}),

21
src/mode/cam/slice.js
View file

@ -477,7 +477,7 @@
offset = cutTabs(tabs, offset, slice.z); offset = cutTabs(tabs, offset, slice.z);
} }
if (proc.camOutlineDogbone) { if (proc.camOutlineDogbone && !procOutlineWide) {
CAM.addDogbones(offset, outlineToolDiam / 4); CAM.addDogbones(offset, outlineToolDiam / 4);
} }
@ -571,11 +571,12 @@
ondone(); ondone();
}; };
CAM.addDogbones = function(poly, dist) { CAM.addDogbones = function(poly, dist, reverse) {
if (Array.isArray(poly)) { if (Array.isArray(poly)) {
return poly.forEach(p => CAM.addDogbones(p, dist)); return poly.forEach(p => CAM.addDogbones(p, dist));
} }
let isCW = poly.isClockwise(); let isCW = poly.isClockwise();
if (reverse || poly.parent) isCW = !isCW;
let oldpts = poly.points.slice(); let oldpts = poly.points.slice();
let lastpt = oldpts[oldpts.length - 1]; let lastpt = oldpts[oldpts.length - 1];
let lastsl = lastpt.slopeTo(oldpts[0]).toUnit(); let lastsl = lastpt.slopeTo(oldpts[0]).toUnit();
@ -584,14 +585,15 @@
let nextpt = oldpts[i % oldpts.length]; let nextpt = oldpts[i % oldpts.length];
let nextsl = lastpt.slopeTo(nextpt).toUnit(); let nextsl = lastpt.slopeTo(nextpt).toUnit();
let adiff = lastsl.angleDiff(nextsl, true); let adiff = lastsl.angleDiff(nextsl, true);
if (isCW && adiff > 0) { let bdiff = ((adiff < 0 ? (180 - adiff) : (180 + adiff)) / 2) + 180;
let newa = BASE.newSlopeFromAngle(lastsl.angle - adiff / 2); if (isCW && adiff > 45) {
let newa = BASE.newSlopeFromAngle(lastsl.angle + bdiff);
newpts.push(lastpt.projectOnSlope(newa, dist)); newpts.push(lastpt.projectOnSlope(newa, dist));
newpts.push(lastpt.clone()); newpts.push(lastpt.clone());
console.log('CW dogbone at', lastpt); console.log('CW dogbone', lastsl.angle.round(2), adiff.round(2));
} else if (!isCW && adiff < 0) { } else if (!isCW && adiff < -45) {
console.log('CCW dogbone at', lastpt); console.log('CCW dogbone', lastsl.angle.round(2), ':', nextsl.angle.round(2), '=', adiff.round(2));
let newa = BASE.newSlopeFromAngle(lastsl.angle - adiff / 2); let newa = BASE.newSlopeFromAngle(lastsl.angle - bdiff);
newpts.push(lastpt.projectOnSlope(newa, dist)); newpts.push(lastpt.projectOnSlope(newa, dist));
newpts.push(lastpt.clone()); newpts.push(lastpt.clone());
} }
@ -603,6 +605,9 @@
} }
poly.points = newpts; poly.points = newpts;
poly.length = newpts.length; poly.length = newpts.length;
if (poly.inner) {
CAM.addDogbones(poly.inner, dist, true);
}
}; };
CAM.traces = function(settings, widget) { CAM.traces = function(settings, widget) {