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

tweak tower fill. remove anchors from all but leading widget. clarify hover/text on skirt

Browse source
This commit is contained in:
Stewart Allen 2021-11-17 21:08:37 -05:00
commit 800f4300e7
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/mode/fdm/prepare.js
View file

@ -44,7 +44,6 @@
layerno = 0, layerno = 0,
zoff = 0, zoff = 0,
layerout = [], layerout = [],
// slices = [],
print = self.worker.print = KIRI.newPrint(settings, widgets), print = self.worker.print = KIRI.newPrint(settings, widgets),
beltfact = Math.cos(Math.PI/4); beltfact = Math.cos(Math.PI/4);
@ -274,7 +273,7 @@
} }
} }
function mkrec(i, angle = 45) { function mkrec(i, angle = 45, thin = 6) {
blokpos.x += walkpos.x * i; blokpos.x += walkpos.x * i;
blokpos.y += walkpos.y * i; blokpos.y += walkpos.y * i;
let exi = device.extruders[i], let exi = device.extruders[i],
@ -286,7 +285,7 @@
], angle, noz)), ], angle, noz)),
sparse = linesToPoly(POLY.fillArea([ sparse = linesToPoly(POLY.fillArea([
newPolygon().centerRectangle(pos, blok.x - noz, blok.y - noz) newPolygon().centerRectangle(pos, blok.x - noz, blok.y - noz)
], angle + 90, noz * 5)), ], angle + 90, noz * thin)),
rec = { rec = {
extruder: i, extruder: i,
diameter: exi.extNozzle, diameter: exi.extNozzle,
@ -343,7 +342,7 @@
if (isBelt && z < 0) { if (isBelt && z < 0) {
let scale = 1 + ((z / blokw)); let scale = 1 + ((z / blokw));
mkblok(blokw * scale, blokh); mkblok(blokw * scale, blokh);
rec = mkrec(rec.extruder, 0); rec = mkrec(rec.extruder, 0, 10);
} }
let box = rec.rect.clone().setZ(z); let box = rec.rect.clone().setZ(z);
let fill = (z >= 0 && purgeOn ? rec.full : rec.sparse).clone().setZ(z); let fill = (z >= 0 && purgeOn ? rec.full : rec.sparse).clone().setZ(z);

9
src/mode/fdm/slice.js
View file

@ -98,6 +98,15 @@
FDM.sliceAll = function(settings, onupdate) { FDM.sliceAll = function(settings, onupdate) {
// future home of brim and anchor generation // future home of brim and anchor generation
let widgets = Object.values(KIRI.worker.cache).sort((a,b) => {
return a.slices[0].z - b.slices[0].z
});
// ignore first widget
widgets.shift();
// remove anchor slices from other widgets
for (let w of widgets) {
w.slices = w.slices.filter(s => s.index >= 0);
}
}; };
/** /**

2
web/kiri/lang/en.js
View file

@ -345,7 +345,7 @@ kiri.lang['en-us'] = {
fl_skrt_s: "skirt count", fl_skrt_s: "skirt count",
fl_skrt_l: ["number of first-layer offset","brims to generate"], fl_skrt_l: ["number of first-layer offset","brims to generate"],
fl_skro_s: "skirt offset", fl_skro_s: "skirt offset",
fl_skro_l: ["skirt offset from part","in millimeters"], fl_skro_l: ["skirt offset from part","in millimeters","when rafts are used","this is the raft offset"],
fl_nozl_s: "nozzle temp", fl_nozl_s: "nozzle temp",
fl_nozl_l: ["degrees in celsius","output setting used","when this is zero"], fl_nozl_l: ["degrees in celsius","output setting used","when this is zero"],
fl_bedd_s: "bed temp", fl_bedd_s: "bed temp",