add optional seprate infill speed. fix 'a' arrange behavior

This commit is contained in:
Stewart Allen 2021-01-25 08:49:42 -05:00
commit 876f6c9d44
5 changed files with 18 additions and 4 deletions

View file

@ -287,6 +287,7 @@
sliceFillAngle: 45,
sliceFillOverlap: 0.3,
sliceFillSparse: 0.5,
sliceFillRate: 0,
sliceFillType: "hex",
sliceSupportDensity: 0.25,
sliceSupportOffset: 1.0,

View file

@ -459,9 +459,15 @@
renderMode++;
API.function.slice();
break;
case cca('a'): // auto arrange items on platform
platform.layout();
API.space.set_focus(API.selection.widgets());
case cca('a'):
if (API.view.get() === VIEWS.ARRANGE) {
// auto arrange items on platform
platform.layout();
API.space.set_focus(API.selection.widgets());
} else {
// go to arrange view
API.view.set(VIEWS.ARRANGE);
}
break;
default:
API.event.emit('keypress', evt);
@ -1653,6 +1659,8 @@
sliceFillSparse: UC.newInput(LANG.fi_pcnt_s, {title:LANG.fi_pcnt_l, convert:UC.toFloat, bound:UC.bound(0.0,1.0), modes:FDM}),
sliceFillAngle: UC.newInput(LANG.fi_angl_s, {title:LANG.fi_angl_l, convert:UC.toFloat, modes:FDM}),
sliceFillOverlap: UC.newInput(LANG.fi_over_s, {title:LANG.fi_over_l, convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}),
sliceFillRate: UC.newInput(LANG.ou_feed_s, {title:LANG.fi_rate_l, convert:UC.toInt, bound:UC.bound(0,300), modes:FDM}),
fdmSupport: UC.newGroup(LANG.sp_menu, null, {modes:FDM, marker:false}),
sliceSupportNozzle: UC.newSelect(LANG.sp_nozl_s, {title:LANG.sp_nozl_l, modes:FDM}, "extruders"),

View file

@ -442,6 +442,7 @@
firstPrintMult = process.firstLayerPrintMult,
printSpeed = opt.speed || (firstLayer ? firstShellSpeed : process.outputFeedrate),
fillSpeed = opt.speed || opt.fillSpeed || (firstLayer ? firstFillSpeed || firstShellSpeed : process.outputFeedrate),
infillSpeed = process.sliceFillRate || opt.infillSpeed || fillSpeed || printSpeed,
moveSpeed = process.outputSeekrate,
origin = startPoint.add(offset),
zhop = process.zHopDistance || 0,
@ -779,7 +780,7 @@
// then output solid and sparse fill
outputFills(next.fill_lines);
outputSparse(next.fill_sparse, sparseMult);
outputSparse(next.fill_sparse, sparseMult, infillSpeed);
lastTop = next;
}