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 numbers in expressions

Browse source
This commit is contained in:
Stewart Allen 2021-07-31 09:59:51 -04:00
commit b9bc5ecc85
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri/print.js
View file

@ -1269,8 +1269,12 @@
tok = str.substring(cs+1,ce); tok = str.substring(cs+1,ce);
let eva = []; let eva = [];
for (let [k,v] of Object.entries(consts)) { for (let [k,v] of Object.entries(consts)) {
if (typeof v === 'number') {
eva.push(`let ${k} = ${v};`);
} else {
eva.push(`let ${k} = "${v}";`); eva.push(`let ${k} = "${v}";`);
} }
}
eva.push(`function range(a,b) { return (a + (layer / layers) * (b-a)).round(4) }`) eva.push(`function range(a,b) { return (a + (layer / layers) * (b-a)).round(4) }`)
eva.push(`try {( ${tok} )} catch (e) {console.log(e);0}`); eva.push(`try {( ${tok} )} catch (e) {console.log(e);0}`);
let scr = eva.join(''); let scr = eva.join('');

4
src/mode/fdm/export.js
View file

@ -387,7 +387,7 @@
subst.z = subst.Z = zpos.round(3); subst.z = subst.Z = zpos.round(3);
subst.e = subst.E = outputLength; subst.e = subst.E = outputLength;
subst.layer = layer; subst.layer = layer;
subst.height = path.height.toFixed(3); subst.height = path.height;
if (isBelt) { if (isBelt) {
pos.z = zpos; pos.z = zpos;
@ -424,7 +424,7 @@
if (gcodeLayer && gcodeLayer.length) { if (gcodeLayer && gcodeLayer.length) {
appendAllSub(gcodeLayer); appendAllSub(gcodeLayer);
} else { } else {
append(`;; --- layer ${layer} (${subst.height} @ ${subst.z.round(3)}) ---`); append(`;; --- layer ${layer} (${subst.height.toFixed(3)} @ ${subst.z.round(3)}) ---`);
} }
// layer temp and fan overrides at layer changes // layer temp and fan overrides at layer changes

2
web/kiri/cxdlp.html
View file

@ -83,7 +83,7 @@
let rawd = data.data; let rawd = data.data;
for (let x=0; x<size; x++) { for (let x=0; x<size; x++) {
for (let y=0; y<size; y++) { for (let y=0; y<size; y++) {
let ind = (x * size + y) * 2; let ind = (y * size + x) * 2;
let rgb = (tile[ind] << 8) | (tile[ind+1] << 0); let rgb = (tile[ind] << 8) | (tile[ind+1] << 0);
let pos = (y * size + x) * 4; let pos = (y * size + x) * 4;
rawd[pos+0] = ((rgb >> 11) << 3) & 0xff; rawd[pos+0] = ((rgb >> 11) << 3) & 0xff;