add 'avoid gaps' output option

This commit is contained in:
Stewart Allen 2021-11-03 10:07:19 -04:00
commit f4ec56be0e
5 changed files with 6 additions and 1 deletions

View file

@ -373,6 +373,7 @@
outputCoastDist: 0, outputCoastDist: 0,
outputPurgeTower: true, outputPurgeTower: true,
outputBeltFirst: false, outputBeltFirst: false,
outputAvoidGaps: true,
outputLayerRetract: false, outputLayerRetract: false,
outputOriginCenter: true, outputOriginCenter: true,
outputLoops: 0, outputLoops: 0,

View file

@ -1851,6 +1851,7 @@
sliceLayerStart: UC.newSelect(LANG.sl_strt_s, {title:LANG.sl_strt_l, modes:FDM}, "start"), sliceLayerStart: UC.newSelect(LANG.sl_strt_s, {title:LANG.sl_strt_l, modes:FDM}, "start"),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}),
outputLayerRetract: UC.newBoolean(LANG.ad_lret_s, onBooleanClick, {title:LANG.ad_lret_l, modes:FDM}), outputLayerRetract: UC.newBoolean(LANG.ad_lret_s, onBooleanClick, {title:LANG.ad_lret_l, modes:FDM}),
outputAvoidGaps: UC.newBoolean(LANG.ad_agap_s, onBooleanClick, {title:LANG.ad_agap_l, modes:FDM}),
outputBeltFirst: UC.newBoolean(LANG.ad_lbir_s, onBooleanClick, {title:LANG.ad_lbir_l, show: isBelt, modes:FDM}), outputBeltFirst: UC.newBoolean(LANG.ad_lbir_s, onBooleanClick, {title:LANG.ad_lbir_l, show: isBelt, modes:FDM}),
camConventional: UC.newBoolean(LANG.ou_conv_s, onBooleanClick, {title:LANG.ou_conv_l, modes:CAM}), camConventional: UC.newBoolean(LANG.ou_conv_s, onBooleanClick, {title:LANG.ou_conv_l, modes:CAM}),
camEaseDown: UC.newBoolean(LANG.cr_ease_s, onBooleanClick, {title:LANG.cr_ease_l, modes:CAM}), camEaseDown: UC.newBoolean(LANG.cr_ease_s, onBooleanClick, {title:LANG.cr_ease_l, modes:CAM}),

View file

@ -590,7 +590,7 @@
}); });
}); });
// if intersecting, look for a route around // if intersecting, look for a route around
if (int && opt.danger) { if (int && opt.routeAround) {
return !routeAround(p1, p2); return !routeAround(p1, p2);
} }
return int; return int;

View file

@ -393,6 +393,7 @@
offset, offset,
layerout, layerout,
{ {
routeAround: process.outputAvoidGaps,
seedPoint: printPoint.sub(offset), seedPoint: printPoint.sub(offset),
danger: isDanger, danger: isDanger,
params, // range parameters params, // range parameters

View file

@ -614,6 +614,8 @@ kiri.lang['en-us'] = {
ad_lbir_l: ["always print shells touching the","belt before any other shells"], ad_lbir_l: ["always print shells touching the","belt before any other shells"],
ad_lret_s: "layer retract", ad_lret_s: "layer retract",
ad_lret_l: ["force filament retraction","between layers"], ad_lret_l: ["force filament retraction","between layers"],
ad_agap_s: "avoid gaps",
ad_agap_l: ["route around gaps rather","than perform a retract","when possible"],
ad_play_s: "polish layers", ad_play_s: "polish layers",
ad_play_l: ["polish up to specified","# of layers at a time"], ad_play_l: ["polish up to specified","# of layers at a time"],
ad_pspd_s: "polish speed", ad_pspd_s: "polish speed",