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

start to add back outline features

Browse source
This commit is contained in:
Stewart Allen 2025-12-09 21:35:45 -05:00
commit 2097f8d6e2
6 changed files with 86 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/core/conf.js
View file

@ -428,6 +428,7 @@ export const conf = {
camAreaTrace: "none",
camAreaSurface: "linear",
camAreaDirection: "climb",
camAreaEdgeOnly: false,
camAreaAngle: 0,
camAreaOver: 0.4,
camAreaDown: 1,
@ -534,6 +535,7 @@ export const conf = {
camOutlineRevbone: false,
camOutlineDown: 3,
camOutlineIn: false,
camOutlineOut: true,
camOutlineOmitThru: false,
camOutlineOver: 0.4,
camOutlineOverCount: 1,

7
src/kiri/mode/cam/cl-ops.js
View file

@ -265,6 +265,8 @@ export function createPopOps() {
dogbones: 'camOutlineDogbone',
revbones: 'camOutlineRevbone',
omitthru: 'camOutlineOmitThru',
outside: 'camOutlineOut',
inside: 'camOutlineIn',
wide: 'camOutlineWide',
ov_topz: 0,
ov_botz: 0,
@ -279,7 +281,10 @@ export function createPopOps() {
step: UC.newInput(LANG.cc_sovr_s, { title: LANG.cc_sovr_l, convert: toFloat, bound: UC.bound(0.01, 1.0), show: () => env.popOp.outline.rec.wide }),
steps: UC.newInput(LANG.cc_sovc_s, { title: LANG.cc_sovc_l, convert: toInt, bound: UC.bound(1, 500), show: () => env.popOp.outline.rec.wide }),
sep: UC.newBlank({ class: "pop-sep" }),
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 } }),
omitthru: UC.newBoolean(LANG.co_omit_s, undefined, { title: LANG.co_omit_l }),
sep: UC.newBlank({ class: "pop-sep" }),
wide: UC.newBoolean(LANG.co_wide_s, undefined, { title: LANG.co_wide_l }),
dogbones: UC.newBoolean(LANG.co_dogb_s, undefined, { title: LANG.co_dogb_l, show: (op) => { return !op.inputs.wide.checked } }),
revbones: UC.newBoolean(LANG.co_dogr_s, undefined, { title: LANG.co_dogr_l, show: () => env.poppedRec.dogbones }),
@ -674,6 +679,7 @@ export function createPopOps() {
follow: 'camAreaFollow',
refine: 'camAreaRefine',
outline: 'camAreaOutline',
edgeonly: 'camAreaEdgeOnly',
tolerance: 'camTolerance',
dogbones: 'camAreaDogbones',
revbones: 'camAreaRevbones',
@ -690,6 +696,7 @@ export function createPopOps() {
UC.newButton("surface", surfaceAdd),
], { class: "ext-buttons f-row" }),
outline: UC.newBoolean(LANG.cp_outl_s, undefined, { title: LANG.cp_outl_l }),
edgeonly: UC.newBoolean("edges only", undefined, { title: "edges only", show: isClear }),
expand: UC.newInput(LANG.cp_xpnd_s, { title: LANG.cp_xpnd_l, convert: toFloat, units }),
smooth: UC.newInput(LANG.cp_smoo_s, { title: LANG.cp_smoo_l, convert: toInt, xshow: isSurface }),
follow: UC.newInput(LANG.cp_foll_s, { title: LANG.cp_foll_l, convert: toFloat }),

6
src/kiri/mode/cam/op-area.js
View file

@ -26,7 +26,7 @@ class OpArea extends CamOp {
async slice(progress) {
let { op, state } = this;
let { tool, mode, down, over, follow, expand, outline, smooth } = op;
let { tool, mode, down, over, follow, edgeonly, expand, outline, smooth } = op;
let { ov_topz, ov_botz, direction, rename } = op;
let { settings, widget, tabs, color } = state;
let { addSlices, setToolDiam, cutTabs, shadowAt, workarea } = state;
@ -137,7 +137,7 @@ class OpArea extends CamOp {
let layers = slice.output();
let shadow = await shadowAt(z);
let tool_shadow = POLY.offset(shadow, [ toolDiam / 2 - ts_off ], { count: 1, z });
// for roughing backward compatability
// for roughing/outline backward compatability
if (op.omitthru) {
shadow = shadow.clone(true);
for (let poly of shadow.filter(p => p.inner)) {
@ -156,7 +156,7 @@ class OpArea extends CamOp {
let clip = [];
POLY.subtract([ area ], shadow, clip, undefined, undefined, 0);
POLY.offset(clip, [ -toolDiam / 2, -toolOver ], {
count: 999, outs, flat: true, z, minArea: 0
count: edgeonly ? 1 : 999, outs, flat: true, z, minArea: 0
});
// if we see no offsets, re-check the mesh bottom Z then exit
if (outs.length === 0) {

83
src/kiri/mode/cam/op-outline.js
View file

@ -14,37 +14,72 @@ class OpOutline extends CamOp {
async slice(progress) {
let { op, state } = this;
let { shadow, tool, widget } = state;
let { dogbones, down, inside, omitthru, outside, ov_botz, ov_topz } = op;
let { plunge, rate, rename, revbones, spindle, tool } = op;
let { shadow, widget } = state;
let shadow_base = shadow.base;
if (!(shadow_base && shadow_base.length)) {
throw 'missing shadow base';
}
let areas = POLY.flatten(POLY.expand(shadow.base, tool.fluteDiameter() / 2 - 0.001));
let cutout = {
areas: { [widget.id]: areas.map(p => p.toArray()) },
dogbones: op.dogbones,
down: op.down,
expand: 0,
mode: 'trace',
outline: op.omitthru,
ov_botz: op.ov_botz,
ov_topz: op.ov_topz,
plunge: op.plunge,
rate: op.rate,
rename: op.rename ?? "outline",
revbones: op.revbones,
smooth: 0,
spindle: op.spindle,
surfaces: {},
tool: op.tool,
tr_type: 'none',
};
this.op_cutout = new OpArea(state, cutout);
return this.op_cutout.slice(progress);
let ops_list = this.ops_list = [ ];
if (outside) {
let areas = POLY.flatten(POLY.expand(shadow.base, state.tool.fluteDiameter() / 2 - 0.001));
ops_list.push(new OpArea(state, {
areas: { [widget.id]: areas.map(p => p.toArray()) },
dogbones,
down,
expand: 0,
mode: 'trace',
outline: omitthru,
ov_botz,
ov_topz,
plunge,
rate,
rename: rename ?? "outline",
revbones,
smooth: 0,
spindle,
surfaces: {},
tool,
tr_type: 'none',
}));
} else {
let areas = shadow.base.clone(true);
ops_list.push(new OpArea(state, {
areas: { [widget.id]: areas.map(p => p.toArray()) },
dogbones,
down,
edgeonly: true,
expand: 0,
mode: 'clear',
ov_botz,
ov_topz,
plunge,
rate,
rename: rename ?? "outline",
revbones,
smooth: 0,
spindle,
surfaces: {},
tool,
}));
if (!inside) {
// add outline
}
}
for (let op of this.ops_list) {
await op.slice(progress);
}
}
async prepare(ops, progress) {
return this.op_cutout.prepare(ops, progress);
for (let op of this.ops_list) {
await op.prepare(ops, progress);
}
}
}

22
src/kiri/mode/cam/op-rough.js
View file

@ -30,8 +30,9 @@ class OpRough extends CamOp {
}
let areas = POLY.flatten(POLY.expand(shadowBase, tool.fluteDiameter() / 2 - 0.001));
let ops_list = this.ops_list = [ ];
let rough = {
ops_list.push(new OpArea(state, {
rename: op.rename ?? "rough",
spindle: op.spindle,
tool: op.tool,
@ -50,13 +51,10 @@ class OpRough extends CamOp {
ov_topz: op.ov_topz,
areas: { [widget.id]: areas.map(p => p.toArray()) },
surfaces: {}
};
this.op_rough = new OpArea(state, rough);
await this.op_rough.slice(progress);
}));
if (cutOutside) {
let cutout = {
ops_list.push(new OpArea(state, {
rename: op.rename ?? "rough",
spindle: op.spindle,
tool: op.tool,
@ -72,16 +70,18 @@ class OpRough extends CamOp {
ov_topz: op.ov_topz,
areas: { [widget.id]: areas.map(p => p.toArray()) },
surfaces: {}
};
this.op_cutout = new OpArea(state, cutout);
await this.op_cutout.slice(progress);
}));
}
for (let op of this.ops_list) {
await op.slice(progress);
}
}
async prepare(ops, progress) {
await this.op_rough.prepare(ops, progress);
if (this.op_cutout) await this.op_cutout.prepare(ops, progress);
for (let op of this.ops_list) {
await op.prepare(ops, progress);
}
}
}