From b9bc5ecc8533dc62c78d77cbf49929b184e0d492 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Sat, 31 Jul 2021 09:59:51 -0400
Subject: [PATCH] fix numbers in expressions

---
 src/kiri/print.js      | 6 +++++-
 src/mode/fdm/export.js | 4 ++--
 web/kiri/cxdlp.html    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/kiri/print.js b/src/kiri/print.js
index c4378b93..41bc39fe 100644
--- a/src/kiri/print.js
+++ b/src/kiri/print.js
@@ -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}`);
diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js
index 8bf7fb91..8edc948e 100644
--- a/src/mode/fdm/export.js
+++ b/src/mode/fdm/export.js
@@ -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
diff --git a/web/kiri/cxdlp.html b/web/kiri/cxdlp.html
index 42792e6b..f83dc3a1 100644
--- a/web/kiri/cxdlp.html
+++ b/web/kiri/cxdlp.html
@@ -83,7 +83,7 @@
             let rawd = data.data;
             for (let x=0; x<size; x++) {
                 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 pos = (y * size + x) * 4;
                     rawd[pos+0] = ((rgb >> 11) << 3) & 0xff;