From f28885e26e3b6f74893f68113c4ac93e499e106d Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 21 Nov 2020 15:35:23 -0500 Subject: [PATCH] reflow menu --- src/kiri/init.js | 22 ++++++++++------------ src/mode/fdm/client.js | 2 -- web/kiri/lang/en.js | 12 +++++------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index eac86bc7..07a32764 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1432,13 +1432,6 @@ laserSliceHeightMin: UC.newInput(LANG.ls_lahm_s, {title:LANG.ls_lahm_l, convert:UC.toFloat, modes:LASER, show:() => { return UI.laserSliceHeight.value == 0 }}), laserSliceSingle: UC.newBoolean(LANG.ls_sngl_s, onBooleanClick, {title:LANG.ls_sngl_l, modes:LASER}), - fdmInfill: UC.newGroup(LANG.fi_menu, $('settings'), {modes:FDM, marker:true}), - sliceFillType: UC.newSelect(LANG.fi_type, {modes:FDM}, "infill"), - fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), - 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, expert:true}), - sliceFillOverlap: UC.newInput(LANG.fi_over_s, {title:LANG.fi_over_l, convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM, expert:true}), - firstLayer: UC.newGroup(LANG.fl_menu, null, {modes:FDM}), firstSliceHeight: UC.newInput(LANG.fl_lahi_s, {title:LANG.fl_lahi_l, convert:UC.toFloat, modes:FDM}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), @@ -1451,6 +1444,16 @@ fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), firstLayerNozzleTemp:UC.newInput(LANG.fl_nozl_s, {title:LANG.fl_nozl_l, convert:UC.toInt, modes:FDM, expert:true}), firstLayerBedTemp: UC.newInput(LANG.fl_bedd_s, {title:LANG.fl_bedd_l, convert:UC.toInt, modes:FDM, expert:true}), + fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), + outputRaftSpacing: UC.newInput(LANG.fr_spac_s, {title:LANG.fr_spac_l, convert:UC.toFloat, bound:UC.bound(0.0,3.0), modes:FDM, show: () => UI.outputRaft.checked }), + outputRaft: UC.newBoolean(LANG.fr_nabl_s, onBooleanClick, {title:LANG.fr_nabl_l, modes:FDM, trigger: true}), + + fdmInfill: UC.newGroup(LANG.fi_menu, $('settings'), {modes:FDM}), + sliceFillType: UC.newSelect(LANG.fi_type, {modes:FDM}, "infill"), + fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), + 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, expert:true}), + sliceFillOverlap: UC.newInput(LANG.fi_over_s, {title:LANG.fi_over_l, convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM, expert:true}), fdmSupport: UC.newGroup(LANG.sp_menu, null, {modes:FDM, marker:true}), sliceSupportDensity: UC.newInput(LANG.sp_dens_s, {title:LANG.sp_dens_l, convert:UC.toFloat, bound:UC.bound(0.05,1.0), modes:FDM}), @@ -1466,11 +1469,6 @@ sliceSupportNozzle: UC.newSelect(LANG.sp_nozl_s, {title:LANG.sp_nozl_l, modes:FDM, expert:true}, "extruders"), sliceSupportEnable: UC.newBoolean(LANG.enable, onBooleanClick, {modes:FDM}), - fdmRaft: UC.newGroup(LANG.fr_menu, null, {modes:FDM, marker:true}), - outputRaftSpacing: UC.newInput(LANG.fr_spac_s, {title:LANG.fr_spac_l, convert:UC.toFloat, bound:UC.bound(0.0,3.0), modes:FDM}), - fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), - outputRaft: UC.newBoolean(LANG.enable, onBooleanClick, {title:LANG.fr_nabl_l, modes:FDM}), - camRough: UC.newGroup(LANG.cr_menu, null, {modes:CAM, marker:true}), camRoughTool: UC.newSelect(LANG.cc_tool, {modes:CAM}), camRoughSpindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, modes:CAM, visible:spindleShow}), diff --git a/src/mode/fdm/client.js b/src/mode/fdm/client.js index 57fcda91..9c87aafc 100644 --- a/src/mode/fdm/client.js +++ b/src/mode/fdm/client.js @@ -17,8 +17,6 @@ api.event.on("settings.saved", (settings) => { let proc = settings.process; api.ui.fdmSupport.marker.style.display = proc.sliceSupportEnable ? 'flex' : 'none'; - api.ui.fdmInfill.marker.style.display = proc.sliceFillSparse > 0 ? 'flex' : 'none'; - api.ui.fdmRaft.marker.style.display = proc.outputRaft ? 'flex' : 'none'; }); } diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 29443c3d..bea77f55 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -213,7 +213,7 @@ kiri.lang['en-us'] = { fi_over_l: "overlap with shell and fill\nas % of nozzle width\nhigher bonds better\n0.0 - 1.0", // FDM FIRST LAYER - fl_menu: "1st layer", + fl_menu: "base", fl_lahi_s: "layer height", fl_lahi_l: "height of each slice\nin millimeters\nshould be >= slice height", fl_rate_s: "shell speed", @@ -230,6 +230,10 @@ kiri.lang['en-us'] = { fl_nozl_l: "degrees in celsius\noutput setting used\nwhen this is zero", fl_bedd_s: "bed temp", fl_bedd_l: "degrees in celsius\noutput setting used\nwhen this is zero", + fr_spac_s: "raft gap", + fr_spac_l: "additional layer spacing\nbetween 1st layer and raft\nin millimeters", + fr_nabl_s: "raft enable", + fr_nabl_l: "create a raft under the\nmodel for better adhesion\nuses skirt offset and\ndisables skirt output", // FDM SUPPORT sp_menu: "support", @@ -343,12 +347,6 @@ kiri.lang['en-us'] = { ct_hght_l: "height in workspace units", ct_nabl_l: "enable or disable tabs\ntab generation skipped when\ninside only mode enabled", - // FDM RAFT - fr_menu: "raft", - fr_spac_s: "spacing", - fr_spac_l: "additional layer spacing\nbetween 1st layer and raft\nin millimeters", - fr_nabl_l: "create a raft under the\nmodel for better adhesion\nuses skirt offset and\ndisables skirt output", - // OUTPUT ou_menu: "output",