temporary workaround for lack of 'rest' machining state. addresses issue #221
This commit is contained in:
parent
9851f481dc
commit
3b7f1e298e
4 changed files with 8 additions and 0 deletions
|
|
@ -71,6 +71,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
|
|||
startCenter = process.outputOriginCenter,
|
||||
alignTop = settings.controller.alignTop,
|
||||
zclear = (process.camZClearance || 1),
|
||||
zmax_force = process.camForceZMax || false,
|
||||
zmax_outer = hasStock ? stock.z + zclear : outerz + zclear,
|
||||
wztop = widget.track.top,
|
||||
ztOff = hasStock ? stock.z - wztop : 0,
|
||||
|
|
@ -305,6 +306,9 @@ function prepEach(widget, settings, print, firstPoint, update) {
|
|||
),
|
||||
mustGoUp = Math.max(maxz - point.z, maxz - lastPoint.z) >= tolerance,
|
||||
clearz = maxz;
|
||||
if (zmax_force) {
|
||||
clearz = maxz = zmax + zadd;
|
||||
}
|
||||
// up if any point between higher than start/outline, go up first
|
||||
if (mustGoUp) {
|
||||
layerPush(lastPoint.clone().setZ(clearz + ztOff), 0, 0, tool.getNumber());
|
||||
|
|
|
|||
|
|
@ -546,6 +546,7 @@ const conf = exports({
|
|||
outputInvertY: false,
|
||||
camExpertFast: false,
|
||||
camTrueShadow: false,
|
||||
camForceZMax: false,
|
||||
ops: [], // current ops
|
||||
op2: [] // flip ops
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1952,6 +1952,7 @@ gapp.register("kiri.init", [], (root, exports) => {
|
|||
outputOriginBounds: uc.newBoolean(LANG.or_bnds_s, onBooleanClick, {title:LANG.or_bnds_l, modes:LASER}),
|
||||
outputOriginCenter: uc.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:CAM_LZR}),
|
||||
camOriginTop: uc.newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l, modes:CAM}),
|
||||
camForceZMax: uc.newBoolean(LANG.ou_forz_s, onBooleanClick, {title:LANG.ou_forz_l, modes:CAM}),
|
||||
|
||||
camExpert: uc.newGroup(LANG.op_xprt_s, null, {group: "cam_expert", modes:CAM, marker: false}),
|
||||
camExpertFast: uc.newBoolean(LANG.cx_fast_s, onBooleanClick, {title:LANG.cx_fast_l, modes:CAM, show: () => !ui.camTrueShadow.checked }),
|
||||
|
|
|
|||
Loading…
Reference in a new issue