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

fix restore from .km preserving widget annotations. fix trace ordering for tops that split down. fix support z span

Browse source
This commit is contained in:
Stewart Allen 2021-02-18 22:47:52 -05:00
commit 125f9cb16b
4 changed files with 72 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri/main.js
View file

@ -2271,10 +2271,11 @@
}
}
if (isSettings) {
clearWorkspace();
settings = CONF.normalize(data.settings);
SDB.setItem('ws-settings', JSON.stringify(settings));
if (LOCAL) console.log('settings',Object.clone(settings));
restoreSettings();
if (LOCAL) console.log('settings',Object.clone(settings));
if (isWork) {
API.platform.clear();
KIRI.codec.decode(data.work).forEach(widget => {
@ -2416,7 +2417,6 @@
function restoreSettings(save) {
let newset = ls2o('ws-settings') || settings;
settings = CONF.normalize(newset);
// override camera from settings
if (settings.controller.view) {

79
src/kiri/print.js
View file

@ -566,12 +566,48 @@
return int;
}
function outputTraces(poly, extrude) {
function outputTraces(poly, opt = {}) {
if (!poly) return;
if (Array.isArray(poly)) {
outputOrderClosest(poly, function(next) {
outputTraces(next, extrude);
}, null);
if (opt.sort) {
let polys = poly.slice().sort(function(a,b) {
return (a.perimeter() - b.perimeter()) * opt.sort;
});
let debug = polys.length > 3;
let last;
while (polys.length) {
let next;
for (let p of polys) {
if (!last) {
next = p;
break;
}
if (opt.sort > 0) {
// in-out
if (last.isInside(p)) {
next = p;
break;
}
} else {
// out-in
if (p.isInside(last)) {
next = p;
break;
}
}
}
if (next) {
last = next;
polys.remove(next);
outputTraces(next, opt);
} else {
last = null;
}
}
}
// outputOrderClosest(poly, function(next) {
// outputTraces(next, opt);
// }, null);
} else {
let finishShell = poly.depth === 0 && !firstLayer;
startPoint = scope.polyPrintPath(poly, startPoint, preout, {
@ -580,7 +616,7 @@
accel: finishShell,
wipe: process.outputWipeDistance || 0,
coast: firstLayer ? 0 : coastDist,
extrude: pref(extrude, shellMult),
extrude: pref(opt.extrude, shellMult),
onfirst: function(firstPoint) {
if (startPoint.distTo2D(firstPoint) > retractDist) {
retract();
@ -776,11 +812,11 @@
* the special exception that depth is considered into distance
* so that inner polygons are emitted first.
*
* @param {Array} array of Polygon or Polygon wrappers
* @param {Function} fn
* @param {Function} fnp convert 'next' object into a Polygon
* @param {Array} array of Polygons or Polygon wrappers (tops)
* @param {Function} fn call to emit next candidate
* @param {Function} fnp convert 'next' object into a Polygon for closeness
*/
function outputOrderClosest(array, fn, fnp, newTop) {
function outputOrderClosest(array, fn, fnp) {
if (array.length === 1) {
return fn(array[0]);
}
@ -800,7 +836,6 @@
d: find.distance - (poly.depth * thinWall),
});
}
newTop = false;
if (order.length === 0) {
return;
}
@ -848,23 +883,24 @@
shellOrder = -1;
}
// top object
let bounds = POLY.flatten(next.shellsAtDepth(0).clone(true));
// innermost shells
let inner = next.innerShells() || [];
// output inner polygons
if (shellOrder === 1)
outputTraces([].appendAll(next.innerShells() || []));
if (shellOrder === 1) outputTraces(inner);
outputTraces(next.shells, { sort: shellOrder });
// sort perimeter polygon by length to go out-to-in or in-to-out
(next.shells || []).sort(function(a,b) {
return a.perimeter() > b.perimeter() ? shellOrder : -shellOrder;
}).forEach(function(poly, index) {
outputTraces(poly);
});
// this causes too much seeking when nesting splits into disconnected areas
// (next.shells || []).sort(function(a,b) {
// return a.perimeter() > b.perimeter() ? shellOrder : -shellOrder;
// }).forEach(function(poly, index) {
// outputTraces(poly);
// });
// output outer polygons
if (shellOrder === -1)
outputTraces([].appendAll(next.innerShells() || []));
if (shellOrder === -1) outputTraces(inner);
// output thin fill
outputFills(next.thin_fill, {near: true});
@ -876,6 +912,7 @@
lastTop = next;
}
}, function(obj) {
// for tops
return obj instanceof Polygon ? obj : obj.poly;
});