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

connect sparse infill in some cases. rename .b64 to .km

Browse source
This commit is contained in:
Stewart Allen 2020-11-19 21:33:47 -05:00
commit f3231e4420
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kiri/init.js
View file

@ -503,7 +503,7 @@
} }
function deviceExport(exp, name) { function deviceExport(exp, name) {
name = (name || "kiridev") name = (name || "device")
.toLowerCase() .toLowerCase()
.replace(/ /g,'_') .replace(/ /g,'_')
.replace(/\./g,'_'); .replace(/\./g,'_');
@ -511,7 +511,7 @@
if (name) { if (name) {
let blob = new Blob([exp], {type: "octet/stream"}), let blob = new Blob([exp], {type: "octet/stream"}),
url = WIN.URL.createObjectURL(blob); url = WIN.URL.createObjectURL(blob);
$('mod-any').innerHTML = `<a id="sexport" href="${url}" download="${name}.b64">x</a>`; $('mod-any').innerHTML = `<a id="sexport" href="${url}" download="${name}.km">x</a>`;
$('sexport').click(); $('sexport').click();
} }
}); });
@ -529,14 +529,14 @@
" </div>", " </div>",
"</div>" "</div>"
]}; ]};
UC.confirm("Export Filename", {ok:true, cancel: false}, "km_conf", opt).then(name => { UC.confirm("Export Filename", {ok:true, cancel: false}, "profile", opt).then(name => {
if (name) { if (name) {
let work = $('incwork').checked, let work = $('incwork').checked,
json = API.conf.export({work}), json = API.conf.export({work}),
blob = new Blob([json], {type: "octet/stream"}), blob = new Blob([json], {type: "octet/stream"}),
url = WIN.URL.createObjectURL(blob); url = WIN.URL.createObjectURL(blob);
$('mod-any').innerHTML = [ $('mod-any').innerHTML = [
`<a id="sexport" href="${url}" download="${name}.b64">x</a>` `<a id="sexport" href="${url}" download="${name}.km">x</a>`
].join(''); ].join('');
$('sexport').click(); $('sexport').click();
} }

2
src/kiri/main.js
View file

@ -1605,7 +1605,7 @@
isstl = lower.indexOf(".stl") > 0, isstl = lower.indexOf(".stl") > 0,
issvg = lower.indexOf(".svg") > 0, issvg = lower.indexOf(".svg") > 0,
isgcode = lower.indexOf(".gcode") > 0 || lower.indexOf(".nc") > 0, isgcode = lower.indexOf(".gcode") > 0 || lower.indexOf(".nc") > 0,
isset = lower.indexOf(".b64") > 0; isset = lower.indexOf(".b64") > 0 || lower.indexOf(".km") > 0;
reader.file = files[i]; reader.file = files[i];
reader.onloadend = function (e) { reader.onloadend = function (e) {
if (israw) platform.add( if (israw) platform.add(

14
src/kiri/print.js
View file

@ -475,11 +475,21 @@
poly.reverse(); poly.reverse();
} }
poly.forEachPoint(function(p, i) { poly.forEachPoint(function(p, i) {
let dist = lp.distTo2D(p);
let rdst = dist > retractDist;
let itop = rdst && intersectsTop(lp,p);
let emit = extrude;
// retract if dist trigger and crosses a slice top polygon // retract if dist trigger and crosses a slice top polygon
if (i === 0 && lp && lp.distTo2D(p) > retractDist && intersectsTop(lp,p)) { if (i === 0) {
if (itop) {
retract(); retract();
emit = 0;
} else if (rdst) {
emit = 0;
} }
addOutput(preout, p, i === 0 ? 0 : extrude, speed || printSpeed, extruder); }
// let emit = i === 0 ? 0 : extrude;
addOutput(preout, p, emit, speed || printSpeed, extruder);
lp = p; lp = p;
}); });
return lp; return lp;