fix numbers in expressions
This commit is contained in:
parent
9ab310d2a3
commit
b9bc5ecc85
3 changed files with 8 additions and 4 deletions
|
|
@ -1269,7 +1269,11 @@
|
|||
tok = str.substring(cs+1,ce);
|
||||
let eva = [];
|
||||
for (let [k,v] of Object.entries(consts)) {
|
||||
eva.push(`let ${k} = "${v}";`);
|
||||
if (typeof v === 'number') {
|
||||
eva.push(`let ${k} = ${v};`);
|
||||
} else {
|
||||
eva.push(`let ${k} = "${v}";`);
|
||||
}
|
||||
}
|
||||
eva.push(`function range(a,b) { return (a + (layer / layers) * (b-a)).round(4) }`)
|
||||
eva.push(`try {( ${tok} )} catch (e) {console.log(e);0}`);
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@
|
|||
subst.z = subst.Z = zpos.round(3);
|
||||
subst.e = subst.E = outputLength;
|
||||
subst.layer = layer;
|
||||
subst.height = path.height.toFixed(3);
|
||||
subst.height = path.height;
|
||||
|
||||
if (isBelt) {
|
||||
pos.z = zpos;
|
||||
|
|
@ -424,7 +424,7 @@
|
|||
if (gcodeLayer && gcodeLayer.length) {
|
||||
appendAllSub(gcodeLayer);
|
||||
} 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue