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

annotate widget with filename, when available

Browse source
This commit is contained in:
Stewart Allen 2020-07-30 10:34:12 -04:00
commit 21b0e2b9d5
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/kiri/main.js
View file

@ -1140,16 +1140,19 @@
} else {
ajax(url, function(vertices) {
vertices = js2o(vertices).toFloat32();
platform.add(newWidget().loadVertices(vertices));
if (onload) onload(vertices);
let widget = newWidget().loadVertices(vertices);
platform.add(widget);
if (onload) onload(vertices, widget);
});
}
}
function platformLoadSTL(url, onload) {
new MOTO.STL().load(url, function(vertices) {
platform.add(newWidget().loadVertices(vertices));
if (onload) onload(vertices);
new MOTO.STL().load(url, function(vertices, filename) {
let widget = newWidget().loadVertices(vertices);
widget.filename = filename;
platform.add(widget);
if (onload) onload(vertices, widget);
})
}

1
src/kiri/widget.js
View file

@ -295,6 +295,7 @@
PRO.saveToCatalog = function(filename) {
let widget = this;
let time = UTIL.time();
widget.filename = filename;
KIRI.catalog.putFile(filename, this.getGeoVertices(), function(vertices) {
if (vertices && vertices.length) {
console.log("saving decimated mesh ["+vertices.length+"] time ["+(UTIL.time()-time)+"]");

10
src/moto/load-stl.js
View file

@ -32,7 +32,15 @@
function onloaded (event) {
if (event.target.status === 200 || event.target.status === 0) {
stl.parse(event.target.response || event.target.responseText);
if (callback) callback(stl.vertices);
let cd = xhr.getResponseHeader('Content-Disposition');
if (cd) {
cd = cd.split(';').map(v => v.trim()).filter(v => {
return v.indexOf('filename=') === 0;
}).map(v => {
return v.substring(10,v.length-1);
});
}
if (callback) callback(stl.vertices, cd ? cd[0] : undefined);
} else {
if (callback) callback(null, event.target.statusText);
}