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

draft shield and raft are mutually exclusive. improve tool tip

Browse source
This commit is contained in:
Stewart Allen 2022-02-06 16:11:28 -05:00
commit 48145505ad
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kiri-mode/fdm/prepare.js
View file

@ -45,7 +45,7 @@
layerno = 0, layerno = 0,
zoff = 0, zoff = 0,
zmin = 0, zmin = 0,
brimout, shield,
layerout = [], layerout = [],
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);
@ -167,7 +167,7 @@
}); });
print.setType('brim'); print.setType('brim');
brimout = POLY.nest(polys.clone(), true).clone(); shield = POLY.nest(polys.clone(), true).clone();
// output brim points // output brim points
let brimStart = offset < nozzle * 2 ? newPoint(-bedWidth, -bedDepth, 0) : printPoint; let brimStart = offset < nozzle * 2 ? newPoint(-bedWidth, -bedDepth, 0) : printPoint;
@ -569,11 +569,11 @@
} }
// draft shield // draft shield
if (layerno > 0 && brimout && draftShield) { if (layerno > 0 && shield && draftShield) {
print.setType('shield'); print.setType('shield');
brimout = POLY.setZ(brimout.clone(), printPoint.z); shield = POLY.setZ(shield.clone(), printPoint.z);
let preout = []; let preout = [];
printPoint = print.poly2polyEmit(brimout, printPoint, (poly, index, count, startPoint) => { printPoint = print.poly2polyEmit(shield, printPoint, (poly, index, count, startPoint) => {
return print.polyPrintPath(poly, startPoint, preout, { return print.polyPrintPath(poly, startPoint, preout, {
onfirst: function(point) { onfirst: function(point) {
if (preout.length && point.distTo2D(startPoint) > 2) { if (preout.length && point.distTo2D(startPoint) > 2) {

4
src/kiri/init.js
View file

@ -1782,9 +1782,9 @@
outputBrimCount: UC.newInput(LANG.fl_skrt_s, {title:LANG.fl_skrt_l, convert:UC.toInt, modes:FDM, show:isNotBelt}), outputBrimCount: UC.newInput(LANG.fl_skrt_s, {title:LANG.fl_skrt_l, convert:UC.toInt, modes:FDM, show:isNotBelt}),
outputBrimOffset: UC.newInput(LANG.fl_skro_s, {title:LANG.fl_skro_l, convert:UC.toFloat, modes:FDM, show:isNotBelt}), outputBrimOffset: UC.newInput(LANG.fl_skro_s, {title:LANG.fl_skro_l, convert:UC.toFloat, modes:FDM, show:isNotBelt}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:isNotBelt}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:isNotBelt}),
outputDraftShield: UC.newBoolean(LANG.fr_draf_s, onBooleanClick, {title:LANG.fr_draf_l, modes:FDM, trigger: true, show:isNotBelt}), outputDraftShield: UC.newBoolean(LANG.fr_draf_s, onBooleanClick, {title:LANG.fr_draf_l, modes:FDM, trigger: true, show:() => !UI.outputRaft.checked && isNotBelt}),
outputRaftSpacing: UC.newInput(LANG.fr_spac_s, {title:LANG.fr_spac_l, convert:UC.toFloat, bound:UC.bound(0.0,3.0), modes:FDM, show: () => UI.outputRaft.checked && isNotBelt() }), outputRaftSpacing: UC.newInput(LANG.fr_spac_s, {title:LANG.fr_spac_l, convert:UC.toFloat, bound:UC.bound(0.0,3.0), modes:FDM, show: () => UI.outputRaft.checked && isNotBelt() }),
outputRaft: UC.newBoolean(LANG.fr_nabl_s, onBooleanClick, {title:LANG.fr_nabl_l, modes:FDM, trigger: true, show:isNotBelt}), outputRaft: UC.newBoolean(LANG.fr_nabl_s, onBooleanClick, {title:LANG.fr_nabl_l, modes:FDM, trigger: true, show:() => !UI.outputDraftShield.checked && isNotBelt}),
fdmInfill: UC.newGroup(LANG.fi_menu, $('settings'), {modes:FDM}), fdmInfill: UC.newGroup(LANG.fi_menu, $('settings'), {modes:FDM}),
sliceFillType: UC.newSelect(LANG.fi_type, {modes:FDM, trigger:true}, "infill"), sliceFillType: UC.newSelect(LANG.fi_type, {modes:FDM, trigger:true}, "infill"),

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

@ -360,7 +360,7 @@ kiri.lang['en-us'] = {
fr_nabl_s: "raft enable", fr_nabl_s: "raft enable",
fr_nabl_l: ["create a raft under the","model for better adhesion","uses skirt offset and","disables skirt output"], fr_nabl_l: ["create a raft under the","model for better adhesion","uses skirt offset and","disables skirt output"],
fr_draf_s: "draft shield", fr_draf_s: "draft shield",
fr_draf_l: ["extend brim to height of part","which acts as a shield","and traps hot air"], fr_draf_l: ["extend skirt to height of part","which acts as a shield against","drafts and traps hot air"],
// FDM BELT ONLY // FDM BELT ONLY
fl_zoff_s: "belt offset", fl_zoff_s: "belt offset",