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 CAM z extend option on registration op independent of 'Z Thru' global

Browse source
This commit is contained in:
Stewart Allen 2022-10-06 13:20:47 -04:00
commit 3f2e9e3c19
6 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/kiri-mode/cam/client.js
View file

@ -1153,6 +1153,7 @@ CAM.init = function(kiri, api) {
dwell: 'camDrillDwell',
lift: 'camDrillLift',
feed: 'camRegisterSpeed',
thru: 'camRegisterThru'
}).inputs = {
tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
axis: UC.newSelect(LANG.cd_axis, {}, "regaxis"),
@ -1163,7 +1164,9 @@ CAM.init = function(kiri, api) {
down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}),
rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}),
dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat, show:() => poppedRec.axis !== '-'}),
lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => poppedRec.axis !== '-'})
lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => poppedRec.axis !== '-'}),
sep: UC.newBlank({class:"pop-sep"}),
thru: UC.newInput(LANG.cd_thru_s, {title:LANG.cd_thru_l, convert:UC.toFloat, units:true}),
};
createPopOp('flip', {

2
src/kiri-mode/cam/ops.js
View file

@ -1183,7 +1183,7 @@ class OpRegister extends CamOp {
o3 = tool.fluteDiameter() * 2,
mx = (lx + hx) / 2,
my = (ly + hy) / 2,
mz = zThru || 0,
mz = op.thru || zThru || 0,
dx = (stock.x - (hx - lx)) / 4,
dy = (stock.y - (hy - ly)) / 4,
dz = stock.z,

2
src/kiri-mode/cam/slice.js
View file

@ -40,7 +40,7 @@ CAM.slice = function(settings, widget, onupdate, ondone) {
zBottom = proc.camZBottom - zbOff,
zMin = Math.max(bounds.min.z, zBottom),
zMax = bounds.max.z,
zThru = zBottom === 0 ? (proc.camZThru || 0) : 0,
zThru = proc.camZBottom ? 0 : (proc.camZThru || 0),
zTop = zMax + ztOff,
minToolDiam = Infinity,
maxToolDiam = -Infinity,