From 11ce3a026d2d34c5cc09715b9f24d18a6095bf34 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 29 May 2024 08:52:16 -0400 Subject: [PATCH] test different fdm menu breakdown --- src/kiri/init.js | 35 ++++++++++++++++++++--------------- web/kiri/index.html | 3 +++ web/kiri/lang/en.js | 29 +++++++++++++++++++---------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 5589a486..83c5dc50 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1844,18 +1844,20 @@ gapp.register("kiri.init", [], (root, exports) => { /** FDM Settings */ - process: newGroup(LANG.sl_menu, $('fdm-layers'), { modes:FDM, driven, separator }), + _____: newGroup(LANG.sl_menu, $('fdm-layers'), { modes:FDM, driven, separator }), sliceHeight: newInput(LANG.sl_lahi_s, { title:LANG.sl_lahi_l, convert:toFloat }), sliceMinHeight: newInput(LANG.ad_minl_s, { title:LANG.ad_minl_l, convert:toFloat, bound:bound(0,3.0), show: () => ui.sliceAdaptive.checked}), - sliceShells: newInput(LANG.sl_shel_s, { title:LANG.sl_shel_l, convert:toFloat }), - sliceLineWidth: newInput(LANG.sl_line_s, { title:LANG.sl_line_l, convert:toFloat, bound:bound(0,5) }), - outputFanLayer: newInput(LANG.ou_fanl_s, { title:LANG.ou_fanl_l, convert:toInt, bound:bound(0,255) }), sliceTopLayers: newInput(LANG.sl_ltop_s, { title:LANG.sl_ltop_l, convert:toInt }), sliceBottomLayers: newInput(LANG.sl_lbot_s, { title:LANG.sl_lbot_l, convert:toInt }), separator: newBlank({ class:"set-sep", driven }), - sliceDetectThin: newSelect(LANG.ad_thin_s, { title: LANG.ad_thin_l, action: thinWallSave }, "thin"), sliceAdaptive: newBoolean(LANG.ad_adap_s, onBooleanClick, {title: LANG.ad_adap_l, trigger: true}), - firstLayer: newGroup(LANG.fl_menu, $('fdm-base'), { modes:FDM, driven, separator }), + _____: newGroup(LANG.sw_menu, $('fdm-walls'), { modes:FDM, driven, separator }), + sliceShells: newInput(LANG.sl_shel_s, { title:LANG.sl_shel_l, convert:toFloat }), + sliceLineWidth: newInput(LANG.sl_line_s, { title:LANG.sl_line_l, convert:toFloat, bound:bound(0,5) }), + sliceShellOrder: newSelect(LANG.sl_ordr_s, {title:LANG.sl_ordr_l}, "shell"), + sliceDetectThin: newSelect(LANG.ad_thin_s, { title: LANG.ad_thin_l, action: thinWallSave }, "thin"), + outputAlternating: newBoolean(LANG.ad_altr_s, onBooleanClick, {title:LANG.ad_altr_l}), + _____: newGroup(LANG.fl_menu, $('fdm-base'), { modes:FDM, driven, separator }), firstSliceHeight: newInput(LANG.fl_lahi_s, {title:LANG.fl_lahi_l, convert:toFloat, show:isNotBelt}), firstLayerNozzleTemp:newInput(LANG.fl_nozl_s, {title:LANG.fl_nozl_l, convert:toInt, show:isNotBelt}), firstLayerBedTemp: newInput(LANG.fl_bedd_s, {title:LANG.fl_bedd_l, convert:toInt, show:isNotBelt}), @@ -1864,6 +1866,7 @@ gapp.register("kiri.init", [], (root, exports) => { firstLayerFlatten: newInput(LANG.fl_flat_s, {title:LANG.fl_flat_l, convert:toFloat, show:isBelt}), firstLayerRate: newInput(LANG.fl_rate_s, {title:LANG.fl_rate_l, convert:toFloat}), firstLayerFillRate: newInput(LANG.fl_frat_s, {title:LANG.fl_frat_l, convert:toFloat, show:isNotBelt}), + separator: newBlank({ class:"set-sep", driven }), firstLayerLineMult: newInput(LANG.fl_sfac_s, {title:LANG.fl_sfac_l, convert:toFloat, bound:bound(0.5,2), show:isNotBelt}), firstLayerPrintMult: newInput(LANG.fl_mult_s, {title:LANG.fl_mult_l, convert:toFloat}), firstLayerBrim: newInput(LANG.fl_brim_s, {title:LANG.fl_brim_l, convert:toInt, show:isBelt}), @@ -1872,13 +1875,14 @@ gapp.register("kiri.init", [], (root, exports) => { firstLayerBrimGap: newInput(LANG.fl_brgp_s, {title:LANG.fl_brgp_l, convert:toFloat, show:isBelt}), firstLayerBeltLead: newInput(LANG.fl_bled_s, {title:LANG.fl_bled_l, convert:toFloat, show:isBelt}), firstLayerBeltBump: newInput(LANG.fl_blmp_s, {title:LANG.fl_blmp_l, convert:toFloat, bound:bound(0, 10), show:isBelt}), + separator: newBlank({ class:"set-sep", driven }), outputBrimCount: newInput(LANG.fl_skrt_s, {title:LANG.fl_skrt_l, convert:toInt, show:isNotBelt}), outputBrimOffset: newInput(LANG.fl_skro_s, {title:LANG.fl_skro_l, convert:toFloat, show:isNotBelt}), outputRaftSpacing: newInput(LANG.fr_spac_s, {title:LANG.fr_spac_l, convert:toFloat, bound:bound(0.0,3.0), show: () => ui.outputRaft.checked && isNotBelt() }), separator: newBlank({ class:"set-sep", driven }), outputRaft: newBoolean(LANG.fr_nabl_s, onBooleanClick, {title:LANG.fr_nabl_l, trigger: true, show:() => isNotBelt()}), outputDraftShield: newBoolean(LANG.fr_draf_s, onBooleanClick, {title:LANG.fr_draf_l, trigger: true, show:() => isNotBelt()}), - fdmInfill: newGroup(LANG.fi_menu, $('fdm-fill'), { modes:FDM, driven, separator }), + _____: newGroup(LANG.fi_menu, $('fdm-fill'), { modes:FDM, driven, separator }), sliceFillType: newSelect(LANG.fi_type, {trigger:true}, "infill"), sliceFillSparse: newInput(LANG.fi_pcnt_s, {title:LANG.fi_pcnt_l, convert:toFloat, bound:bound(0.0,1.0)}), sliceFillRepeat: newInput(LANG.fi_rept_s, {title:LANG.fi_rept_l, convert:toInt, bound:bound(1,10), show:fillShow}), @@ -1887,7 +1891,13 @@ gapp.register("kiri.init", [], (root, exports) => { sliceSolidRate: newInput(LANG.ou_fini_s, {title:LANG.ou_fini_l, convert:toInt, bound:bound(0,500)}), sliceFillGrow: newInput(LANG.fi_grow_s, {title:LANG.fi_grow_l, convert:toFloat}), sliceFillAngle: newInput(LANG.fi_angl_s, {title:LANG.fi_angl_l, convert:toFloat}), - fdmSupport: newGroup(LANG.sp_menu, $('fdm-support'), { modes:FDM, marker:false, driven, separator }), + _____: newGroup(LANG.fh_menu, $('fdm-heat'), { modes:FDM, driven, separator }), + outputTemp: newInput(LANG.ou_nozl_s, {title:LANG.ou_nozl_l, convert:toInt}), + outputBedTemp: newInput(LANG.ou_bedd_s, {title:LANG.ou_bedd_l, convert:toInt}), + _____: newGroup(LANG.fc_menu, $('fdm-cool'), { modes:FDM, driven, separator }), + outputFanLayer: newInput(LANG.ou_fanl_s, { title:LANG.ou_fanl_l, convert:toInt, bound:bound(0,255) }), + outputFanSpeed: newInput(LANG.ou_fans_s, {title:LANG.ou_fans_l, convert:toInt, bound:bound(0,255)}), + _____: newGroup(LANG.sp_menu, $('fdm-support'), { modes:FDM, marker:false, driven, separator }), sliceSupportNozzle: newSelect(LANG.sp_nozl_s, {title:LANG.sp_nozl_l}, "extruders"), sliceSupportDensity: newInput(LANG.sp_dens_s, {title:LANG.sp_dens_l, convert:toFloat, bound:bound(0.0,1.0)}), sliceSupportSize: newInput(LANG.sp_size_s, {title:LANG.sp_size_l, convert:toFloat, bound:bound(1.0,200.0)}), @@ -1910,24 +1920,19 @@ gapp.register("kiri.init", [], (root, exports) => { (ui.ssmDun = newButton(undefined, onButtonClick, {icon:''})), (ui.ssmClr = newButton(undefined, onButtonClick, {icon:''})) ], {class:"ext-buttons f-row"}), - fdmOutput: newGroup(LANG.ou_menu, $('fdm-output'), { modes:FDM, driven, separator }), - outputTemp: newInput(LANG.ou_nozl_s, {title:LANG.ou_nozl_l, convert:toInt}), - outputBedTemp: newInput(LANG.ou_bedd_s, {title:LANG.ou_bedd_l, convert:toInt}), - outputFanSpeed: newInput(LANG.ou_fans_s, {title:LANG.ou_fans_l, convert:toInt, bound:bound(0,255)}), + _____: newGroup(LANG.ou_menu, $('fdm-output'), { modes:FDM, driven, separator }), outputFeedrate: newInput(LANG.ou_feed_s, {title:LANG.ou_feed_l, convert:toInt}), outputFinishrate: newInput(LANG.ou_fini_s, {title:LANG.ou_fini_l, convert:toInt}), outputSeekrate: newInput(LANG.ou_move_s, {title:LANG.ou_move_l, convert:toInt}), outputShellMult: newInput(LANG.ou_shml_s, {title:LANG.ou_exml_l, convert:toFloat, bound:bound(0.0,2.0)}), outputFillMult: newInput(LANG.ou_flml_s, {title:LANG.ou_exml_l, convert:toFloat, bound:bound(0.0,2.0)}), outputSparseMult: newInput(LANG.ou_spml_s, {title:LANG.ou_exml_l, convert:toFloat, bound:bound(0.0,2.0)}), - sliceShellOrder: newSelect(LANG.sl_ordr_s, {title:LANG.sl_ordr_l}, "shell"), sliceLayerStart: newSelect(LANG.sl_strt_s, {title:LANG.sl_strt_l}, "start"), separator: newBlank({ class:"set-sep", driven }), outputLayerRetract: newBoolean(LANG.ad_lret_s, onBooleanClick, {title:LANG.ad_lret_l}), outputAvoidGaps: newBoolean(LANG.ad_agap_s, onBooleanClick, {title:LANG.ad_agap_l}), - outputAlternating: newBoolean(LANG.ad_altr_s, onBooleanClick, {title:LANG.ad_altr_l}), outputBeltFirst: newBoolean(LANG.ad_lbir_s, onBooleanClick, {title:LANG.ad_lbir_l, show: isBelt}), - fdmExpert: newGroup(LANG.ad_menu, $('fdm-expert'), { modes:FDM, driven, separator }), + _____: newGroup(LANG.ad_menu, $('fdm-expert'), { modes:FDM, driven, separator }), outputRetractDist: newInput(LANG.ad_rdst_s, {title:LANG.ad_rdst_l, convert:toFloat}), outputRetractSpeed: newInput(LANG.ad_rrat_s, {title:LANG.ad_rrat_l, convert:toInt}), outputRetractWipe: newInput(LANG.ad_wpln_s, {title:LANG.ad_wpln_l, convert:toFloat, bound:bound(0.0,10)}), diff --git a/web/kiri/index.html b/web/kiri/index.html index 3aeefc77..81cce9e4 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -273,8 +273,11 @@
+
+
+
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 60f780ba..069ad63c 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -312,32 +312,35 @@ self.kiri.lang['en-us'] = { se_load: "load", se_save: "save", - // FDM SLICING + // FDM LAYERS sl_menu: "layers", sl_lahi_s: "height", sl_lahi_l: ["height of each slice","layer in millimeters"], ad_minl_s: "height min", ad_minl_l: ["adaptive min layer height","in millimeters","must be non-zero"], + ad_adap_s: "adaptive", + ad_adap_l: ["use adaptive layer heights","with 'layer height' as max","and 'layer min' as the min"], sl_ltop_s: "top layers", sl_ltop_l: ["number of solid layers at the top of the print or on flat areas facing up"], sl_lsld_s: "solid layers", sl_lsld_l: ["solid fill areas computed","from bridges and flat areas","detected betwen sliced layers"], sl_lbot_s: "base layers", sl_lbot_l: ["number of solid layers at bottom of the print or under bridge spans"], - ad_adap_s: "adaptive", - ad_adap_l: ["use adaptive layer heights","with 'layer height' as max","and 'layer min' as the min"], + + // FDM WALLS + sw_menu: "walls", + sl_shel_s: "wall count", + sl_shel_l: ["number of perimeter","walls to generate"], + ad_thin_s: "thin wall", + ad_thin_l: ["detect and fill gaps","between shell walls"], // FDM SHELLS - sl_shel_s: "shell count", - sl_shel_l: ["number of perimeter","walls to generate"], - sl_line_s: "line width", + sl_line_s: "wall width", sl_line_l: ["extrusion width in millimeters","0 = nozzle diameter"], - sl_ordr_s: "shell order", + sl_ordr_s: "wall order", sl_ordr_l: ["output shell order","inside to outside","or outside to inside","affects surface quality"], sl_strt_s: "layer start", sl_strt_l: ["layer starting point","last = last layer end","center = part center","origin = device origin"], - ad_thin_s: "thin wall", - ad_thin_l: ["detect and fill gaps","between shell walls"], // FDM FILL fi_menu: "infill", @@ -355,6 +358,12 @@ self.kiri.lang['en-us'] = { // fi_rate_s: "print speed", fi_rate_l: ["extrusion speed for infill","set to 0 to use default","output print speeds"], + // FDM HEATING + fh_menu: "heating", + + // FDM COOLING + fc_menu: "cooling", + // FDM FIRST LAYER fl_menu: "base", fl_lahi_s: "layer height", @@ -674,7 +683,7 @@ self.kiri.lang['en-us'] = { ou_flml_s: "solid factor", ou_spml_s: "infill factor", ou_exml_l: ["extrusion multiplier","0.0 - 2.0"], - ou_fanl_s: "fan on", + ou_fanl_s: "fan on layer", ou_fanl_l: ["layer # to turn on fan","layers start at 0"], ou_fans_s: "fan speed", ou_fans_l: "0 - 255",