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

fix stock for untis conversion. add alignTop option in mode

Browse source
This commit is contained in:
Stewart Allen 2020-03-08 12:12:55 -04:00
commit 8bfd617e20
3 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/kiri-driver-cam.js
View file

@ -376,7 +376,8 @@ var gs_kiri_cam = exports;
var mesh = widget.mesh,
proc = settings.process,
outp = settings.process,
resolution = outp.camTolerance,
units = settings.controller.units === 'in' ? 25.4 : 1,
resolution = outp.camTolerance * units,
diameter = getToolDiameter(settings, proc.finishingTool),
tool = getToolById(settings, proc.finishingTool),
toolStep = diameter * proc.finishingOver,
@ -936,10 +937,12 @@ var gs_kiri_cam = exports;
device = settings.device,
process = settings.process,
stock = settings.stock,
outer = settings.bounds,
widgetIndex = index || 0,
widgetArray = print.widgets,
widgetCount = widgetArray.length,
widget = widgetArray[widgetIndex];
widget = widgetArray[widgetIndex],
alignTop = settings.controller.alignTop;
if (widgetIndex >= widgetCount || !widget) return;
var slices = widget.slices,
@ -948,7 +951,7 @@ var gs_kiri_cam = exports;
hasStock = process.camStockZ && process.camStockX && process.camStockY,
startCenter = process.outputOriginCenter,
zclear = (process.camZClearance || 1) * units,
zadd = hasStock ? stock.z - bounds.max.z : 0,
zadd = hasStock ? stock.z - bounds.max.z : alignTop ? outer.max.z - bounds.max.z : 0,
zmax = hasStock ? stock.z + zclear : bounds.max.z + zclear,
originx = startCenter ? 0 : hasStock ? -stock.x / 2 : bounds.min.x,
originy = startCenter ? 0 : hasStock ? -stock.y / 2 : bounds.min.y,