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

add line width parameter

Browse source
This commit is contained in:
Stewart Allen 2021-05-28 21:36:39 -04:00
commit 76839128e1
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri.js
View file

@ -6,7 +6,7 @@
if (!self.kiri) { if (!self.kiri) {
self.kiri = { self.kiri = {
beta: 3001, beta: 3002,
driver: {}, // driver modules driver: {}, // driver modules
loader: [] // module loading: array of functions loader: [] // module loading: array of functions
}; };

1
src/kiri/conf.js
View file

@ -297,6 +297,7 @@
sliceShells: 3, sliceShells: 3,
sliceShellOrder: "in-out", sliceShellOrder: "in-out",
sliceLayerStart: "last", sliceLayerStart: "last",
sliceLineWidth: 0,
sliceFillAngle: 45, sliceFillAngle: 45,
sliceFillWidth: 1, sliceFillWidth: 1,
sliceFillOverlap: 0.35, sliceFillOverlap: 0.35,

2
src/kiri/init.js
View file

@ -1650,6 +1650,8 @@
sliceMinHeight: UC.newInput(LANG.ad_minl_s, {title:LANG.ad_minl_l, bound:UC.bound(0,3.0), convert:UC.toFloat, modes:FDM, show: () => UI.sliceAdaptive.checked}), sliceMinHeight: UC.newInput(LANG.ad_minl_s, {title:LANG.ad_minl_l, bound:UC.bound(0,3.0), convert:UC.toFloat, modes:FDM, show: () => UI.sliceAdaptive.checked}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}),
sliceShells: UC.newInput(LANG.sl_shel_s, {title:LANG.sl_shel_l, convert:UC.toFloat, modes:FDM}), sliceShells: UC.newInput(LANG.sl_shel_s, {title:LANG.sl_shel_l, convert:UC.toFloat, modes:FDM}),
sliceLineWidth: UC.newInput(LANG.sl_line_s, {title:LANG.sl_line_l, convert:UC.toFloat, bound:UC.bound(0,5), modes:FDM}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}),
sliceTopLayers: UC.newInput(LANG.sl_ltop_s, {title:LANG.sl_ltop_l, convert:UC.toInt, modes:FDM}), sliceTopLayers: UC.newInput(LANG.sl_ltop_s, {title:LANG.sl_ltop_l, convert:UC.toInt, modes:FDM}),
sliceSolidLayers: UC.newInput(LANG.sl_lsld_s, {title:LANG.sl_lsld_l, convert:UC.toInt, modes:FDM}), sliceSolidLayers: UC.newInput(LANG.sl_lsld_s, {title:LANG.sl_lsld_l, convert:UC.toInt, modes:FDM}),
sliceBottomLayers: UC.newInput(LANG.sl_lbot_s, {title:LANG.sl_lbot_l, convert:UC.toInt, modes:FDM}), sliceBottomLayers: UC.newInput(LANG.sl_lbot_s, {title:LANG.sl_lbot_l, convert:UC.toInt, modes:FDM}),

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

@ -66,7 +66,6 @@
sdev = settings.device, sdev = settings.device,
isBelt = sdev.bedBelt, isBelt = sdev.bedBelt,
isSynth = widget.track.synth, isSynth = widget.track.synth,
update_start = Date.now(),
minSolid = spro.sliceSolidMinArea, minSolid = spro.sliceSolidMinArea,
solidLayers = spro.sliceSolidLayers, solidLayers = spro.sliceSolidLayers,
vaseMode = spro.sliceFillType === 'vase' && !isSynth, vaseMode = spro.sliceFillType === 'vase' && !isSynth,
@ -76,17 +75,14 @@
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,
lineWidth = nozzleSize, lineWidth = spro.sliceLineWidth || nozzleSize,
fillOffsetMult = 1.0 - bound(spro.sliceFillOverlap, 0, 0.8), fillOffsetMult = 1.0 - bound(spro.sliceFillOverlap, 0, 0.8),
firstWidthMult = spro.firstLayerShellMult || 1,
shellOffset = lineWidth, shellOffset = lineWidth,
fillSpacing = lineWidth, fillSpacing = lineWidth,
fillOffset = lineWidth * fillOffsetMult, fillOffset = lineWidth * fillOffsetMult,
sliceFillAngle = spro.sliceFillAngle, sliceFillAngle = spro.sliceFillAngle,
supportDensity = spro.sliceSupportDensity, supportDensity = spro.sliceSupportDensity,
view = widget.mesh && widget.mesh.newGroup ? widget.mesh.newGroup() : null, beltfact = Math.cos(Math.PI/4);
beltfact = Math.cos(Math.PI/4),
invbfact = 1 / beltfact;
isFlat = ctrl.lineType === "flat"; isFlat = ctrl.lineType === "flat";
isThin = !isFlat && ctrl.lineType === "line"; isThin = !isFlat && ctrl.lineType === "line";

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

@ -268,6 +268,8 @@ kiri.lang['en-us'] = {
// FDM SHELLS // FDM SHELLS
sl_shel_s: "shell count", sl_shel_s: "shell count",
sl_shel_l: ["number of perimeter","walls to generate"], sl_shel_l: ["number of perimeter","walls to generate"],
sl_line_s: "line width",
sl_line_l: ["extrusion width in millimeters","0 = nozzle diameter"],
sl_ordr_s: "shell order", sl_ordr_s: "shell order",
sl_ordr_l: ["output shell order","inside to outside","or outside to inside","affects surface quality"], sl_ordr_l: ["output shell order","inside to outside","or outside to inside","affects surface quality"],
sl_strt_s: "layer start", sl_strt_s: "layer start",