add expand option to pockets
This commit is contained in:
parent
0d5ad0d74b
commit
4ac00b92a5
5 changed files with 11 additions and 3 deletions
|
|
@ -1037,6 +1037,7 @@ CAM.init = function(kiri, api) {
|
||||||
down: 'camPocketDown',
|
down: 'camPocketDown',
|
||||||
rate: 'camPocketSpeed',
|
rate: 'camPocketSpeed',
|
||||||
plunge: 'camPocketPlunge',
|
plunge: 'camPocketPlunge',
|
||||||
|
expand: 'camPocketExpand'
|
||||||
}).inputs = {
|
}).inputs = {
|
||||||
tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
|
tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
|
||||||
sep: UC.newBlank({class:"pop-sep"}),
|
sep: UC.newBlank({class:"pop-sep"}),
|
||||||
|
|
@ -1045,6 +1046,7 @@ CAM.init = function(kiri, api) {
|
||||||
down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}),
|
down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}),
|
||||||
rate: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true}),
|
rate: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true}),
|
||||||
plunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}),
|
plunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}),
|
||||||
|
expand: UC.newInput(LANG.cp_xpnd_s, {title:LANG.cp_xpnd_l, convert:UC.toFloat, units:true}),
|
||||||
sep: UC.newBlank({class:"pop-sep"}),
|
sep: UC.newBlank({class:"pop-sep"}),
|
||||||
menu: UC.newRow([
|
menu: UC.newRow([
|
||||||
UC.newButton(undefined, func.surfaceAdd, {icon:'<i class="fas fa-plus"></i>'}),
|
UC.newButton(undefined, func.surfaceAdd, {icon:'<i class="fas fa-plus"></i>'}),
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ kiri.load(api => {
|
||||||
|
|
||||||
CAM.surface_find = function(widget, faces) {
|
CAM.surface_find = function(widget, faces) {
|
||||||
CAM.surface_prep(widget);
|
CAM.surface_prep(widget);
|
||||||
return widget.tool.findConnectedSurface(faces, 0.1, 0.001);
|
return widget.tool.findConnectedSurface(faces, 0.1, 0.1);
|
||||||
};
|
};
|
||||||
|
|
||||||
kiri.worker.cam_surfaces = function(data, send) {
|
kiri.worker.cam_surfaces = function(data, send) {
|
||||||
|
|
|
||||||
|
|
@ -924,7 +924,7 @@ class OpPocket extends CamOp {
|
||||||
|
|
||||||
slice(progress) {
|
slice(progress) {
|
||||||
let { op, state } = this;
|
let { op, state } = this;
|
||||||
let { tool, rate, down, plunge } = op;
|
let { tool, rate, down, plunge, expand } = op;
|
||||||
let { settings, widget, sliceAll, zMax, zTop, zThru, tabs } = state;
|
let { settings, widget, sliceAll, zMax, zTop, zThru, tabs } = state;
|
||||||
let { updateToolDiams, cutTabs, cutPolys, healPolys } = state;
|
let { updateToolDiams, cutTabs, cutPolys, healPolys } = state;
|
||||||
let { process, stock } = settings;
|
let { process, stock } = settings;
|
||||||
|
|
@ -968,12 +968,13 @@ class OpPocket extends CamOp {
|
||||||
}
|
}
|
||||||
function clearZ(polys, z, down) {
|
function clearZ(polys, z, down) {
|
||||||
let zs = down ? base.util.lerp(zTop, z, down) : [ z ];
|
let zs = down ? base.util.lerp(zTop, z, down) : [ z ];
|
||||||
|
if (expand) polys = POLY.offset(polys, expand);
|
||||||
for (let poly of polys) {
|
for (let poly of polys) {
|
||||||
genShadows(zs);
|
genShadows(zs);
|
||||||
for (let z of zs) {
|
for (let z of zs) {
|
||||||
let shadow = shadows[z];
|
let shadow = shadows[z];
|
||||||
let clip = [];
|
let clip = [];
|
||||||
POLY.subtract([poly], shadow, clip);
|
POLY.subtract([ poly ], shadow, clip);
|
||||||
let slice = newSliceOut(z);
|
let slice = newSliceOut(z);
|
||||||
slice.camTrace = { tool, rate, plunge };
|
slice.camTrace = { tool, rate, plunge };
|
||||||
POLY.offset(clip, -toolOver, {
|
POLY.offset(clip, -toolOver, {
|
||||||
|
|
|
||||||
|
|
@ -498,6 +498,7 @@ const conf = exports({
|
||||||
camPocketDown: 1,
|
camPocketDown: 1,
|
||||||
camPocketSpeed: 250,
|
camPocketSpeed: 250,
|
||||||
camPocketPlunge: 200,
|
camPocketPlunge: 200,
|
||||||
|
camPocketExpand: 0,
|
||||||
camDrillTool: 1000,
|
camDrillTool: 1000,
|
||||||
camDrillSpindle: 1000,
|
camDrillSpindle: 1000,
|
||||||
camDrillDownSpeed: 250,
|
camDrillDownSpeed: 250,
|
||||||
|
|
|
||||||
|
|
@ -498,6 +498,10 @@ self.kiri.lang['en-us'] = {
|
||||||
cu_type_s: "type",
|
cu_type_s: "type",
|
||||||
cu_type_l: ["clear = clear a closed-line pocket","follow = tool tip follows line","with offset option when closed"],
|
cu_type_l: ["clear = clear a closed-line pocket","follow = tool tip follows line","with offset option when closed"],
|
||||||
|
|
||||||
|
// CNC POCKET
|
||||||
|
cp_xpnd_s: "expand",
|
||||||
|
cp_xpnd_l: ["grow selected area to","encompass corners"],
|
||||||
|
|
||||||
// CNC DRILLING
|
// CNC DRILLING
|
||||||
cd_menu: "drill",
|
cd_menu: "drill",
|
||||||
cd_axis: "axis",
|
cd_axis: "axis",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue