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

add dogbones as an outline option

Browse source
This commit is contained in:
Stewart Allen 2020-12-03 19:51:14 -05:00
commit 83de534a52
5 changed files with 51 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -477,6 +477,10 @@
offset = cutTabs(tabs, offset, slice.z);
}
if (proc.camOutlineDogbone) {
CAM.addDogbones(offset, outlineToolDiam / 4);
}
// offset.xout(`slice ${slice.z}`);
slice.camLines = offset;
if (false) slice.output()
@ -567,7 +571,41 @@
ondone();
};
CAM.traces = function computeTraces(settings, widget) {
CAM.addDogbones = function(poly, dist) {
if (Array.isArray(poly)) {
return poly.forEach(p => CAM.addDogbones(p, dist));
}
let isCW = poly.isClockwise();
let oldpts = poly.points.slice();
let lastpt = oldpts[oldpts.length - 1];
let lastsl = lastpt.slopeTo(oldpts[0]).toUnit();
let newpts = [ ];
for (let i=0; i<oldpts.length + 1; i++) {
let nextpt = oldpts[i % oldpts.length];
let nextsl = lastpt.slopeTo(nextpt).toUnit();
let adiff = lastsl.angleDiff(nextsl, true);
if (isCW && adiff > 0) {
let newa = BASE.newSlopeFromAngle(lastsl.angle - adiff / 2);
newpts.push(lastpt.projectOnSlope(newa, dist));
newpts.push(lastpt.clone());
console.log('CW dogbone at', lastpt);
} else if (!isCW && adiff < 0) {
console.log('CCW dogbone at', lastpt);
let newa = BASE.newSlopeFromAngle(lastsl.angle - adiff / 2);
newpts.push(lastpt.projectOnSlope(newa, dist));
newpts.push(lastpt.clone());
}
lastsl = nextsl;
lastpt = nextpt;
if (i < oldpts.length) {
newpts.push(nextpt);
}
}
poly.points = newpts;
poly.length = newpts.length;
};
CAM.traces = function(settings, widget) {
if (widget.traces) {
// do no work if cached
return false;

13
src/mode/laser/driver.js
View file

@ -173,11 +173,14 @@
for (let i=1; i<oldpts.length + 1; i++) {
let nextpt = oldpts[i % oldpts.length];
let nextsl = lastpt.slopeTo(nextpt).toUnit();
if (lastsl.angleDiff(nextsl) >= 10 && lastpt.distTo2D(nextpt) >= knifeTipOff) {
arc(lastpt, lastsl, nextsl, newpts);
// let tmp;
// newpts.push( tmp = lastpt.projectOnSlope(lastsl, knifeTipOff) );
// newpts.push( lastpt.projectOnSlope(nextsl, knifeTipOff) );
if (lastsl.angleDiff(nextsl) >= 10) {
if (lastpt.distTo2D(nextpt) >= knifeTipOff) {
arc(lastpt, lastsl, nextsl, newpts);
} else {
// todo handle short segments
// newpts.push(lastpt.projectOnSlope(lastsl, knifeTipOff) );
// newpts.push( lastpt.projectOnSlope(nextsl, knifeTipOff) );
}
}
newpts.push(nextpt);
lastsl = nextsl;