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 kiri engine cam var settings

Browse source
This commit is contained in:
Stewart Allen 2025-06-24 13:40:31 -04:00
commit fcba17c428
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -371,7 +371,7 @@ CAM.export = function(print, online) {
append(`; Generated by Kiri:Moto ${kiri.version}`); append(`; Generated by Kiri:Moto ${kiri.version}`);
append(`; ${new Date().toString()}`); append(`; ${new Date().toString()}`);
filterEmit(["; Bed left:{left} right:{right} top:{top} bottom:{bottom}"], consts); filterEmit(["; Bed left:{left} right:{right} top:{top} bottom:{bottom}"], consts);
append(`; Stock X:${stock.x.round(2)} Y:${stock.y.round(2)} Z:${stock.z.round(2)}`); append(`; Stock X:${stock.x?.round(2)} Y:${stock.y?.round(2)} Z:${stock.z?.round(2)}`);
append(`; Target: ${settings.filter[settings.mode]}`); append(`; Target: ${settings.filter[settings.mode]}`);
append("; --- process ---"); append("; --- process ---");
for (let pk in spro) { for (let pk in spro) {

6
src/kiri-mode/cam/prepare.js
View file

@ -79,12 +79,12 @@ function prepEach(widget, settings, print, firstPoint, update) {
bounds = widget.getBoundingBox(), bounds = widget.getBoundingBox(),
boundsz = isIndexed ? stock.z / 2 : bounds.max.z + ztOff, boundsz = isIndexed ? stock.z / 2 : bounds.max.z + ztOff,
zadd = !isIndexed ? stock.z - boundsz : alignTop ? outerz - boundsz : 0, zadd = !isIndexed ? stock.z - boundsz : alignTop ? outerz - boundsz : 0,
zmax = outerz + zclear + process.camOriginOffZ, zmax = outerz + zclear + (process.camOriginOffZ || 0),
wmpos = widget.track.pos, wmpos = widget.track.pos,
wmx = wmpos.x, wmx = wmpos.x,
wmy = wmpos.y, wmy = wmpos.y,
originx = (startCenter ? 0 : -stock.x / 2) + process.camOriginOffX, originx = (startCenter ? 0 : -stock.x / 2) + (process.camOriginOffX || 0),
originy = (startCenter ? 0 : -stock.y / 2) + process.camOriginOffY, originy = (startCenter ? 0 : -stock.y / 2) + (process.camOriginOffY || 0),
origin = newPoint(originx + wmx, originy + wmy, zmax), origin = newPoint(originx + wmx, originy + wmy, zmax),
output = print.output, output = print.output,
easeDown = process.camEaseDown, easeDown = process.camEaseDown,

12
src/kiri-run/engine.js
View file

@ -8,6 +8,7 @@
// dep: kiri.client // dep: kiri.client
// dep: kiri.widget // dep: kiri.widget
// use: add.three // use: add.three
// use: add.array
gapp.register("kiri-run.engine", [], (root, exports) => { gapp.register("kiri-run.engine", [], (root, exports) => {
const { kiri } = root; const { kiri } = root;
@ -105,10 +106,19 @@ class Engine {
} }
setStock(stock) { setStock(stock) {
this.settings.stock = stock; let { settings } = this;
let { process } = settings;
settings.stock = stock;
process.camStockX = stock.x;
process.camStockY = stock.y;
process.camStockZ = stock.z;
return this; return this;
} }
setOrigin(x, y, z) {
this.settings.origin = { x, y, z };
return this;
}
moveTo(x, y, z) { moveTo(x, y, z) {
this.widget.move(x, y, z, true); this.widget.move(x, y, z, true);