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: unit scale when visual z set, gcode import origin, negative level z order

Browse source
This commit is contained in:
Stewart Allen 2026-01-14 10:30:34 -05:00
commit 672b3d1077
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/mode/cam/app/init-ui.js
View file

@ -587,7 +587,7 @@ export function zPlaneSelect({ which, onselect }) {
} }
clearPops(); clearPops();
zPlaneStart(which, value => { zPlaneStart(which, value => {
onselect(parseFloat(value)); onselect(parseFloat(value) / api.view.unit_scale());
}); });
} }

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

@ -79,6 +79,8 @@ export function cam_export(print, online) {
time: 0 time: 0
}; };
// console.log({ offset, origin, stock });
function section(section) { function section(section) {
append(); append();
online({ section }); online({ section });

4
src/kiri/mode/cam/work/op-level.js
View file

@ -27,6 +27,9 @@ class OpLevel extends CamOp {
let zBot = zTop - down; let zBot = zTop - down;
let zList = stepz && down ? util.lerp(zTop, zBot, stepz) : [ zBot ]; let zList = stepz && down ? util.lerp(zTop, zBot, stepz) : [ zBot ];
// ensure zList is descending
zList.sort((a,b) => b - a);
if (share.ran) { if (share.ran) {
console.log('skip'); console.log('skip');
this.skip = true; this.skip = true;
@ -49,6 +52,7 @@ class OpLevel extends CamOp {
POLY.fillArea(clear, 1090, stepOver, points); POLY.fillArea(clear, 1090, stepOver, points);
let layers = this.layers = []; let layers = this.layers = [];
for (let z of zList) { for (let z of zList) {
let lines = []; let lines = [];
layers.push(lines); layers.push(lines);

4
src/kiri/mode/cam/work/prepare.js
View file

@ -567,7 +567,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
} else } else
// otherwise move over before descending // otherwise move over before descending
if (deltaZ <= -tolerance) { if (deltaZ <= -tolerance) {
if (debug) console.log('over before descend'); if (debug) console.log('over before descend', deltaZ, -tolerance);
layerPush(point.clone().setZ(printPoint.z), 0, 0, tool); layerPush(point.clone().setZ(printPoint.z), 0, 0, tool);
newLayer(); newLayer();
} }
@ -636,7 +636,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
// plunge safety catch // plunge safety catch
if (deltaZ < 0 && !contouring) { if (deltaZ < 0 && !contouring) {
if (debug) console.log('deltaZ snap', rate, plungeRate); if (debug) console.log('plunge safety', deltaZ, rate, plungeRate);
emit = 1; emit = 1;
rate = plungeRate; rate = plungeRate;
} }

6
src/kiri/run/worker.js
View file

@ -586,9 +586,9 @@ const dispatch = {
const { process } = settings; const { process } = settings;
const origin = settings.origin; const origin = settings.origin;
const offset = { const offset = {
x: origin.x - (process.camOriginOffX ?? 0), x: origin.x,// - (process.camOriginOffX ?? 0),
y: -origin.y - (process.camOriginOffY ?? 0), y: -origin.y,// - (process.camOriginOffY ?? 0),
z: origin.z - (process.camOriginOffZ ?? 0) z: origin.z,// + (process.camOriginOffZ ?? 0)
}; };
const device = settings.device; const device = settings.device;
const print = setPrint(newPrint(settings, Object.values(wcache))); const print = setPrint(newPrint(settings, Object.values(wcache)));