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

Merge branch 'master' of github.com:GridSpace/grid-apps

Browse source
This commit is contained in:
Stewart Allen 2021-08-01 12:23:48 -04:00
commit 11f308af76
7 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "grid-apps", "name": "grid-apps",
"version": "3.0.15D", "version": "3.0.16D",
"description": "grid.space 3d slice & modeling tools", "description": "grid.space 3d slice & modeling tools",
"author": "Stewart Allen <sa@grid.space>", "author": "Stewart Allen <sa@grid.space>",
"license": "MIT", "license": "MIT",

2
src/kiri.js
View file

@ -6,7 +6,7 @@
if (!self.kiri) { if (!self.kiri) {
self.kiri = { self.kiri = {
beta: 3015, beta: 3016,
driver: {}, // driver modules driver: {}, // driver modules
loader: [] // module loading: array of functions loader: [] // module loading: array of functions
}; };

13
src/kiri/main.js
View file

@ -2443,7 +2443,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
newWidget(undefined,group) newWidget(undefined,group)
.loadVertices(JSON.parse(e.target.result).toFloat32()) .loadVertices(JSON.parse(e.target.result).toFloat32())
); );
if (isstl) { else if (isstl) {
if (API.feature.on_add_stl) { if (API.feature.on_add_stl) {
API.feature.on_add_stl(e.target.result, file); API.feature.on_add_stl(e.target.result, file);
} else { } else {
@ -2455,11 +2455,12 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
); );
} }
} }
if (isgcode) loadCode(e.target.result, 'gcode'); else if (isgcode) loadCode(e.target.result, 'gcode');
if (issvg) loadCode(e.target.result, 'svg'); else if (issvg) loadCode(e.target.result, 'svg');
if (isset) settingsImport(e.target.result, true); else if (isset) settingsImport(e.target.result, true);
if (ispng) loadImageDialog(e.target.result, e.target.file.name); else if (ispng) loadImageDialog(e.target.result, e.target.file.name);
if (isjpg) loadImageConvert(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 (--loaded === 0) platform.group_done(isgcode);
}; };
if (isstl || ispng || isjpg) { if (isstl || ispng || isjpg) {

6
src/kiri/print.js
View file

@ -1269,7 +1269,11 @@
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)) {
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(`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}`);

2
src/license.js
View file

@ -3,7 +3,7 @@
let terms = { let terms = {
COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved", COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved",
LICENSE: "See the license.md file included with the source distribution", LICENSE: "See the license.md file included with the source distribution",
VERSION: "3.0.D15" VERSION: "3.0.D16"
}; };
if (typeof(module) === 'object') { if (typeof(module) === 'object') {

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;