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 1/3] 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;

From f2bc225f3dd6a828da719a3f638d117cb6729ae9 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Sun, 1 Aug 2021 10:04:51 -0400
Subject: [PATCH 2/3] alert when unsupporrted file dropped or imported. fixes
 #183

---
 src/kiri/main.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/kiri/main.js b/src/kiri/main.js
index ad88da0e..5c282dd8 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -2443,7 +2443,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
                     newWidget(undefined,group)
                     .loadVertices(JSON.parse(e.target.result).toFloat32())
                 );
-                if (isstl) {
+                else if (isstl) {
                     if (API.feature.on_add_stl) {
                         API.feature.on_add_stl(e.target.result, file);
                     } else {
@@ -2455,11 +2455,12 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
                         );
                     }
                 }
-                if (isgcode) loadCode(e.target.result, 'gcode');
-                if (issvg) loadCode(e.target.result, 'svg');
-                if (isset) settingsImport(e.target.result, true);
-                if (ispng) loadImageDialog(e.target.result, e.target.file.name);
-                if (isjpg) loadImageConvert(e.target.result, e.target.file.name);
+                else if (isgcode) loadCode(e.target.result, 'gcode');
+                else if (issvg) loadCode(e.target.result, 'svg');
+                else if (isset) settingsImport(e.target.result, true);
+                else if (ispng) loadImageDialog(e.target.result, e.target.file.name);
+                else if (isjpg) loadImageConvert(e.target.result, e.target.file.name);
+                else API.show.alert(`Unsupported file: ${files[i].name}`);
                 if (--loaded === 0) platform.group_done(isgcode);
             };
             if (isstl || ispng || isjpg) {

From 2becb01cdd34a7be844deb412f76ad3bbe01bc64 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Sun, 1 Aug 2021 10:08:08 -0400
Subject: [PATCH 3/3] bump rev 3.0.D16

---
 package.json   | 2 +-
 src/kiri.js    | 2 +-
 src/license.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 013180c8..eb7d5536 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "grid-apps",
-    "version": "3.0.15D",
+    "version": "3.0.16D",
     "description": "grid.space 3d slice & modeling tools",
     "author": "Stewart Allen <sa@grid.space>",
     "license": "MIT",
diff --git a/src/kiri.js b/src/kiri.js
index 32686270..5d8f1b9f 100644
--- a/src/kiri.js
+++ b/src/kiri.js
@@ -6,7 +6,7 @@
 
     if (!self.kiri) {
         self.kiri = {
-            beta: 3015,
+            beta: 3016,
             driver: {}, // driver modules
             loader: []  // module loading: array of functions
         };
diff --git a/src/license.js b/src/license.js
index 5ab20f4f..ebd90b38 100644
--- a/src/license.js
+++ b/src/license.js
@@ -3,7 +3,7 @@
     let terms = {
         COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved",
         LICENSE: "See the license.md file included with the source distribution",
-        VERSION: "3.0.D15"
+        VERSION: "3.0.D16"
     };
 
     if (typeof(module) === 'object') {