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

experimental firstLayerLineMult changes line spacing

Browse source
This commit is contained in:
Stewart Allen 2021-01-15 10:15:30 -05:00
commit dfa07bb380
4 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kiri/conf.js
View file

@ -304,6 +304,7 @@
firstLayerRate: 30, firstLayerRate: 30,
firstLayerFillRate: 35, firstLayerFillRate: 35,
firstLayerPrintMult: 1.0, firstLayerPrintMult: 1.0,
firstLayerLineMult: 1.0,
firstLayerNozzleTemp: 0, firstLayerNozzleTemp: 0,
firstLayerBedTemp: 0, firstLayerBedTemp: 0,
firstLayerBrim: 0, firstLayerBrim: 0,

4
src/kiri/init.js
View file

@ -1597,8 +1597,10 @@
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:() => !UI.deviceBelt.checked}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:() => !UI.deviceBelt.checked}),
firstLayerRate: UC.newInput(LANG.fl_rate_s, {title:LANG.fl_rate_l, convert:UC.toFloat, modes:FDM}), firstLayerRate: UC.newInput(LANG.fl_rate_s, {title:LANG.fl_rate_l, convert:UC.toFloat, modes:FDM}),
firstLayerFillRate: UC.newInput(LANG.fl_frat_s, {title:LANG.fl_frat_l, convert:UC.toFloat, modes:FDM, show:() => !UI.deviceBelt.checked}), firstLayerFillRate: UC.newInput(LANG.fl_frat_s, {title:LANG.fl_frat_l, convert:UC.toFloat, modes:FDM, show:() => !UI.deviceBelt.checked}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:() => !UI.deviceBelt.checked}),
firstLayerLineMult: UC.newInput(LANG.fl_sfac_s, {title:LANG.fl_sfac_l, convert:UC.toFloat, bound:UC.bound(0.5,2), modes:FDM, show:() => !UI.deviceBelt.checked}),
firstLayerPrintMult: UC.newInput(LANG.fl_mult_s, {title:LANG.fl_mult_l, convert:UC.toFloat, modes:FDM}), firstLayerPrintMult: UC.newInput(LANG.fl_mult_s, {title:LANG.fl_mult_l, convert:UC.toFloat, modes:FDM}),
firstLayerBrim: UC.newInput(LANG.fl_brim_s, {title:LANG.fl_brim_l, convert:UC.toFloat, modes:FDM, show:() => UI.deviceBelt.checked}), firstLayerBrim: UC.newInput(LANG.fl_sfac_s, {title:LANG.fl_brim_l, convert:UC.toFloat, modes:FDM, show:() => UI.deviceBelt.checked}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:() => !UI.deviceBelt.checked}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM, show:() => !UI.deviceBelt.checked}),
outputBrimCount: UC.newInput(LANG.fl_skrt_s, {title:LANG.fl_skrt_l, convert:UC.toInt, modes:FDM, show:() => !UI.deviceBelt.checked}), outputBrimCount: UC.newInput(LANG.fl_skrt_s, {title:LANG.fl_skrt_l, convert:UC.toInt, modes:FDM, show:() => !UI.deviceBelt.checked}),
outputBrimOffset: UC.newInput(LANG.fl_skro_s, {title:LANG.fl_skro_l, convert:UC.toFloat, modes:FDM, show:() => !UI.deviceBelt.checked}), outputBrimOffset: UC.newInput(LANG.fl_skro_s, {title:LANG.fl_skro_l, convert:UC.toFloat, modes:FDM, show:() => !UI.deviceBelt.checked}),

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

@ -70,17 +70,18 @@
sliceHeight = spro.sliceHeight, sliceHeight = spro.sliceHeight,
firstSliceHeight = isBelt ? sliceHeight : spro.firstSliceHeight, firstSliceHeight = isBelt ? sliceHeight : spro.firstSliceHeight,
nozzleSize = sdev.extruders[extruder].extNozzle, nozzleSize = sdev.extruders[extruder].extNozzle,
firstOffset = nozzleSize / 2, lineWidth = nozzleSize,
shellOffset = nozzleSize,
fillOffsetMult = 1.0 - bound(spro.sliceFillOverlap, 0, 0.8), fillOffsetMult = 1.0 - bound(spro.sliceFillOverlap, 0, 0.8),
fillSpacing = nozzleSize, firstWidthMult = spro.firstLayerShellMult || 1,
fillOffset = nozzleSize * fillOffsetMult, shellOffset = lineWidth,
fillSpacing = lineWidth,
fillOffset = lineWidth * fillOffsetMult,
sliceFillAngle = spro.sliceFillAngle, sliceFillAngle = spro.sliceFillAngle,
view = widget.mesh && widget.mesh.newGroup ? widget.mesh.newGroup() : null; view = widget.mesh && widget.mesh.newGroup ? widget.mesh.newGroup() : null;
isFlat = settings.controller.lineType === "flat"; isFlat = settings.controller.lineType === "flat";
isThin = !isFlat && settings.controller.lineType === "line"; isThin = !isFlat && settings.controller.lineType === "line";
offset = nozzleSize / 2; offset = lineWidth / 2;
if (isFlat) { if (isFlat) {
Object.values(COLOR).forEach(color => { Object.values(COLOR).forEach(color => {
@ -179,7 +180,7 @@
// for each slice, performe a function and call doupdate() // for each slice, performe a function and call doupdate()
function forSlices(from, to, fn, msg) { function forSlices(from, to, fn, msg) {
slices.forEach(function(slice) { slices.forEach(slice => {
fn(slice); fn(slice);
doupdate(slice.index, from, to, msg) doupdate(slice.index, from, to, msg)
}); });
@ -190,7 +191,7 @@
// reset for solids, support projections // reset for solids, support projections
// and other annotations // and other annotations
slices.forEach(function(slice) { slices.forEach(slice => {
slice.widget = widget; slice.widget = widget;
slice.extruder = extruder; slice.extruder = extruder;
slice.solids = []; slice.solids = [];
@ -212,47 +213,55 @@
} }
// create shells and diff inner fillable areas // create shells and diff inner fillable areas
forSlices(0.0, 0.2, function(slice) { forSlices(0.0, 0.2, slice => {
let first = slice.index === 0;
let solid = ( let solid = (
slice.index < spro.sliceBottomLayers || slice.index < spro.sliceBottomLayers ||
slice.index > slices.length - spro.sliceTopLayers-1 || slice.index > slices.length - spro.sliceTopLayers-1 ||
spro.sliceFillSparse > 0.95 spro.sliceFillSparse > 0.95
) && !vaseMode; ) && !vaseMode;
doShells(slice, spro.sliceShells, firstOffset, shellOffset, fillOffset, { let spaceMult = first ? spro.firstLayerLineMult || 1 : 1;
let offset = shellOffset * spaceMult;
let fillOff = fillOffset * spaceMult;
doShells(slice, spro.sliceShells, offset, fillOff, {
vase: vaseMode, vase: vaseMode,
thin: spro.detectThinWalls, thin: spro.detectThinWalls,
belt0: isBelt && slice.index === 0, belt0: isBelt && first,
widget: widget widget: widget
}); });
if (solid) { if (solid) {
doSolidLayerFill(slice, fillSpacing, sliceFillAngle); let fillSpace = fillSpacing * spaceMult;
doSolidLayerFill(slice, fillSpace, sliceFillAngle);
} }
sliceFillAngle += 90.0; sliceFillAngle += 90.0;
}, "offsets"); }, "offsets");
// calculations only relevant when solid layers are used // calculations only relevant when solid layers are used
if (doSolidLayers) { if (doSolidLayers) {
forSlices(0.2, 0.34, function(slice) { forSlices(0.2, 0.34, slice => {
if (slice.index > 0) doDiff(slice, minSolid); if (slice.index > 0) doDiff(slice, minSolid);
}, "diff"); }, "diff");
forSlices(0.34, 0.35, function(slice) { forSlices(0.34, 0.35, slice => {
projectFlats(slice, solidLayers); projectFlats(slice, solidLayers);
projectBridges(slice, solidLayers); projectBridges(slice, solidLayers);
}, "solids"); }, "solids");
forSlices(0.35, 0.5, function(slice) { forSlices(0.35, 0.5, slice => {
doSolidsFill(slice, fillSpacing, sliceFillAngle, minSolid); let first = slice.index === 0;
let spaceMult = first ? spro.firstLayerLineMult || 1 : 1;
let fillSpace = fillSpacing * spaceMult;
doSolidsFill(slice, fillSpace, sliceFillAngle, minSolid);
sliceFillAngle += 90.0; sliceFillAngle += 90.0;
}, "solids"); }, "solids");
} }
// sparse layers only present when non-vase mose and sparse % > 0 // sparse layers only present when non-vase mose and sparse % > 0
if (!vaseMode && spro.sliceFillSparse > 0.0) { if (!vaseMode && spro.sliceFillSparse > 0.0) {
forSlices(0.5, 0.7, function(slice) { forSlices(0.5, 0.7, slice => {
doSparseLayerFill(slice, { doSparseLayerFill(slice, {
settings: settings, settings: settings,
process: spro, process: spro,
device: sdev, device: sdev,
lineWidth: nozzleSize, lineWidth: lineWidth,
spacing: fillOffset, spacing: fillOffset,
density: spro.sliceFillSparse, density: spro.sliceFillSparse,
bounds: widget.getBoundingBox(), bounds: widget.getBoundingBox(),
@ -267,17 +276,17 @@
let auto = spro.sliceSupportEnable && spro.sliceSupportDensity > 0.0, let auto = spro.sliceSupportEnable && spro.sliceSupportDensity > 0.0,
minArea = spro.sliceSupportArea; minArea = spro.sliceSupportArea;
forSlices(0.7, 0.8, function(slice) { forSlices(0.7, 0.8, slice => {
doSupport(slice, spro, auto, fixed, shadow); doSupport(slice, spro, auto, fixed, shadow);
}, "support"); }, "support");
forSlices(0.8, 0.9, function(slice) { forSlices(0.8, 0.9, slice => {
doSupportFill(slice, nozzleSize, spro.sliceSupportDensity, minArea); doSupportFill(slice, lineWidth, spro.sliceSupportDensity, minArea);
}, "support"); }, "support");
} }
// render if not explicitly disabled // render if not explicitly disabled
if (render) { if (render) {
forSlices(0.9, 1.0, function(slice) { forSlices(0.9, 1.0, slice => {
doRender(slice); doRender(slice);
}, "render"); }, "render");
} }
@ -384,12 +393,12 @@
* this polygon. Adjusting fillOffset controls bonding of infill to the shells. * this polygon. Adjusting fillOffset controls bonding of infill to the shells.
* *
* @param {number} count * @param {number} count
* @param {number} offset1 first offset * @param {number} offsetN
* @param {number} offsetN all subsequent offsets
* @param {number} fillOffset * @param {number} fillOffset
* @param {Obejct} options * @param {Obejct} options
*/ */
function doShells(slice, count, offset1, offsetN, fillOffset, opt = {}) { function doShells(slice, count, offsetN, fillOffset, opt = {}) {
let offset1 = offsetN / 2;
let shellout = 0; let shellout = 0;
slice.tops.forEach(function(top) { slice.tops.forEach(function(top) {

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

@ -209,8 +209,10 @@ kiri.lang['en-us'] = {
fl_rate_l: "shell printing max speed\nin millimeters / minute", fl_rate_l: "shell printing max speed\nin millimeters / minute",
fl_frat_s: "fill speed", fl_frat_s: "fill speed",
fl_frat_l: "fill printing max speed\nin millimeters / minute", fl_frat_l: "fill printing max speed\nin millimeters / minute",
fl_mult_s: "print factor", fl_mult_s: "flow factor",
fl_mult_l: "extrusion multiplier\n0.0 - 2.0", fl_mult_l: "extrusion multiplier\n0.0 - 2.0",
fl_sfac_s: "width factor",
fl_sfac_l: "multiplier on nozzle size\nchanges line spacing",
fl_brim_s: "brim size", fl_brim_s: "brim size",
fl_brim_l: "add brim to part bottom\nsize is width in millimeters\n0 to disable", fl_brim_l: "add brim to part bottom\nsize is width in millimeters\n0 to disable",
fl_skrt_s: "skirt count", fl_skrt_s: "skirt count",