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

apply units conversion to cam z top offset

Browse source
This commit is contained in:
Stewart Allen 2020-10-12 12:14:28 -04:00
commit 62682855a5
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/kiri/main.js
View file

@ -168,6 +168,7 @@
stats: STATS, stats: STATS,
catalog: CATALOG, catalog: CATALOG,
busy: { busy: {
val: () => { return busy },
inc: () => { kiri.api.event.emit("busy", ++busy) }, inc: () => { kiri.api.event.emit("busy", ++busy) },
dec: () => { kiri.api.event.emit("busy", --busy) } dec: () => { kiri.api.event.emit("busy", --busy) }
}, },
@ -990,7 +991,7 @@
if (MODE === MODES.CAM && proc.camOriginTop) { if (MODE === MODES.CAM && proc.camOriginTop) {
z = camTopZ + 0.01; z = camTopZ + 0.01;
if (!camStock) { if (!camStock) {
z += proc.camZTopOffset; z += proc.camZTopOffset * unitScale();
} }
} }
if (!proc.outputOriginCenter) { if (!proc.outputOriginCenter) {
@ -1022,7 +1023,7 @@
function platformUpdateTopZ() { function platformUpdateTopZ() {
let alignTopOk = WIDGETS.length > 1 && settings.controller.alignTop; let alignTopOk = WIDGETS.length > 1 && settings.controller.alignTop;
let camz = (MODE === MODES.CAM) && (settings.stock.z || alignTopOk); let camz = (MODE === MODES.CAM) && (settings.stock.z || alignTopOk);
let ztop = camz ? camTopZ - settings.process.camZTopOffset : 0; let ztop = camz ? camTopZ - settings.process.camZTopOffset * unitScale() : 0;
forAllWidgets(function(widget) { forAllWidgets(function(widget) {
widget.setTopZ(ztop); widget.setTopZ(ztop);
}); });
@ -1249,7 +1250,7 @@
proc = settings.process, proc = settings.process,
oldmode = viewMode, oldmode = viewMode,
layout = (viewMode === VIEWS.ARRANGE && auto), layout = (viewMode === VIEWS.ARRANGE && auto),
topZ = MODE === MODES.CAM ? camTopZ - proc.camZTopOffset : 0; topZ = MODE === MODES.CAM ? camTopZ - proc.camZTopOffset * unitScale() : 0;
switch (MODE) { switch (MODE) {
case MODES.SLA: case MODES.SLA: