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

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)
.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) {

6
src/kiri/print.js
View file

@ -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}`);