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

allow outside only outlines to omit thru inner holes - fixes #103

Browse source
This commit is contained in:
Stewart Allen 2020-12-28 08:43:55 -05:00
commit cdb0051ebd
4 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kiri/conf.js
View file

@ -431,6 +431,7 @@
camOutlinePlunge: 250, camOutlinePlunge: 250,
camOutlineWide: false, camOutlineWide: false,
camOutlineDogbone: false, camOutlineDogbone: false,
camOutlineOmitThru: false,
camOutlineOut: true, camOutlineOut: true,
camOutlineIn: false, camOutlineIn: false,
camOutlineOn: true, camOutlineOn: true,

2
src/mode/cam/client.js
View file

@ -768,6 +768,7 @@
rate: 'camOutlineSpeed', rate: 'camOutlineSpeed',
plunge: 'camOutlinePlunge', plunge: 'camOutlinePlunge',
dogbones: 'camOutlineDogbone', dogbones: 'camOutlineDogbone',
omitthru: 'camOutlineOmitThru',
outside: 'camOutlineOut', outside: 'camOutlineOut',
inside: 'camOutlineIn', inside: 'camOutlineIn',
wide: 'camOutlineWide' wide: 'camOutlineWide'
@ -783,6 +784,7 @@
dogbones: UC.newBoolean(LANG.co_dogb_s, undefined, {title:LANG.co_dogb_l, show:(op) => { return !op.inputs.wide.checked }}), dogbones: UC.newBoolean(LANG.co_dogb_s, undefined, {title:LANG.co_dogb_l, show:(op) => { return !op.inputs.wide.checked }}),
inside: UC.newBoolean(LANG.co_olin_s, undefined, {title:LANG.co_olin_l, show:(op) => { return !op.inputs.outside.checked }}), inside: UC.newBoolean(LANG.co_olin_s, undefined, {title:LANG.co_olin_l, show:(op) => { return !op.inputs.outside.checked }}),
outside: UC.newBoolean(LANG.co_olot_s, undefined, {title:LANG.co_olot_l, show:(op) => { return !op.inputs.inside.checked }}), outside: UC.newBoolean(LANG.co_olot_s, undefined, {title:LANG.co_olot_l, show:(op) => { return !op.inputs.inside.checked }}),
omitthru: UC.newBoolean(LANG.co_omit_s, undefined, {title:LANG.co_omit_l, show:(op) => { return op.inputs.outside.checked }}),
wide: UC.newBoolean(LANG.co_wide_s, undefined, {title:LANG.co_wide_l, show:(op) => { return !op.inputs.inside.checked }}) wide: UC.newBoolean(LANG.co_wide_s, undefined, {title:LANG.co_wide_l, show:(op) => { return !op.inputs.inside.checked }})
}; };

14
src/mode/cam/ops.js
View file

@ -375,7 +375,7 @@
slice(progress) { slice(progress) {
let { op, state } = this; let { op, state } = this;
let { settings, widget, slicer, sliceAll, tshadow } = state; let { settings, widget, slicer, sliceAll, tshadow, thruHoles } = state;
let { updateToolDiams, zThru, zBottom, shadowTop, tabs, cutTabs } = state; let { updateToolDiams, zThru, zBottom, shadowTop, tabs, cutTabs } = state;
let toolDiam = this.toolDiam = new CAM.Tool(settings, op.tool).fluteDiameter(); let toolDiam = this.toolDiam = new CAM.Tool(settings, op.tool).fluteDiameter();
@ -441,6 +441,18 @@
tops = tshadow; tops = tshadow;
} }
if (op.omitthru) {
// eliminate thru holes from shadow
for (let hole of thruHoles) {
for (let top of tops) {
if (!top.inner) continue;
top.inner = top.inner.filter(innr => {
return !innr.isEquivalent(hole);
});
}
}
}
let offset = POLY.expand(tops, toolDiam / 2, slice.z); let offset = POLY.expand(tops, toolDiam / 2, slice.z);
if (!(offset && offset.length)) { if (!(offset && offset.length)) {
return; return;

2
web/kiri/lang/en.js
View file

@ -304,6 +304,8 @@ kiri.lang['en-us'] = {
co_olin_l: "limit cutting to\ninside part boundaries", co_olin_l: "limit cutting to\ninside part boundaries",
co_olot_s: "outside only", co_olot_s: "outside only",
co_olot_l: "limit cutting to\exterior part boundaries\nwhich can be thought of\nas the shadow outline", co_olot_l: "limit cutting to\exterior part boundaries\nwhich can be thought of\nas the shadow outline",
co_omit_s: "omit through",
co_omit_l: "eliminate thru holes",
co_olen_s: "enable", co_olen_s: "enable",
co_olen_l: "enabled outline cutting", co_olen_l: "enabled outline cutting",