diff --git a/src/kiri/init.js b/src/kiri/init.js index 19509995..660d1e96 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1302,6 +1302,7 @@ roughingStock: UC.newInput(LANG.cr_lsto_s, {title:LANG.cr_lsto_l, convert:UC.toFloat, modes:CAM}), roughingPocket: UC.newBoolean(LANG.cr_clrp_s, onBooleanClick, {title:LANG.cr_clrp_l, modes:CAM}), camPocketOnlyRough: UC.newBoolean(LANG.cc_pock_s, onBooleanClick, {title:LANG.cc_pock_l, modes:CAM}), + roughingSep: UC.newBlank({class:"pop-sep"}), roughingOn: UC.newBoolean(LANG.enable, onBooleanClick, {modes:CAM}), finishing: UC.newGroup(LANG.cf_menu, null, {modes:CAM, marker:true}), @@ -1313,10 +1314,11 @@ finishingSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM}), finishingPlunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, modes:CAM}), camPocketOnlyFinish: UC.newBoolean(LANG.cc_pock_s, onBooleanClick, {title:LANG.cc_pock_l, modes:CAM}), + finishCurvesOnly: UC.newBoolean(LANG.cf_curv_s, onBooleanClick, {title:LANG.cf_curv_l, modes:CAM}), + finishingSep: UC.newBlank({class:"pop-sep"}), finishingOn: UC.newBoolean(LANG.cf_watr_s, onBooleanClick, {title:LANG.cf_watr_l, modes:CAM}), finishingXOn: UC.newBoolean(LANG.cf_linx_s, onBooleanClick, {title:LANG.cf_linx_l, modes:CAM}), finishingYOn: UC.newBoolean(LANG.cf_liny_s, onBooleanClick, {title:LANG.cf_liny_l, modes:CAM}), - finishCurvesOnly: UC.newBoolean(LANG.cf_curv_s, onBooleanClick, {title:LANG.cf_curv_l, modes:CAM}), drilling: UC.newGroup(LANG.cd_menu, null, {modes:CAM, marker:true}), drillTool: UC.newSelect(LANG.cc_tool, {modes:CAM}), @@ -1325,6 +1327,7 @@ drillDownSpeed: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toFloat, modes:CAM}), drillDwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat, modes:CAM}), drillLift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, modes:CAM}), + drillingSep: UC.newBlank({class:"pop-sep"}), drillingOn: UC.newBoolean(LANG.enable, onBooleanClick, {modes:CAM}), output: UC.newGroup(LANG.fr_menu, null, {modes:FDM}), @@ -1336,6 +1339,7 @@ camTabsCount: UC.newInput(LANG.ct_numb_s, {title:LANG.ct_numb_l, convert:UC.toInt, bound:UC.bound(1,20), modes:CAM}), camTabsWidth: UC.newInput(LANG.ct_wdth_s, {title:LANG.ct_wdth_l, convert:UC.toFloat, bound:UC.bound(0.1,100), modes:CAM}), camTabsHeight: UC.newInput(LANG.ct_hght_s, {title:LANG.ct_hght_l, convert:UC.toFloat, bound:UC.bound(0.1,100), modes:CAM}), + camTabSep: UC.newBlank({class:"pop-sep"}), camTabsOn: UC.newBoolean(LANG.enable, onBooleanClick, {title:LANG.ct_nabl_l, modes:CAM}), camSep1: UC.newGroup(null, null, {modes:CAM, class:"set-sep"}), diff --git a/src/kiri/ui.js b/src/kiri/ui.js index 6885e6ec..c39969e0 100644 --- a/src/kiri/ui.js +++ b/src/kiri/ui.js @@ -520,14 +520,20 @@ } function newBlank(options) { - let row = newDiv(options), - hide = options && options.hide; + let opt = options || {}, + row = newDiv(opt), + hide = opt.hide; row.setAttribute("class", "var-row"); row.style.display = hide ? 'none' : ''; - ip.setVisible = row.setVisible; - return ip; + if (opt.class) { + opt.class.split(' ').forEach(ce => { + row.classList.add(ce); + }); + } + + return row; } function newButton(label, action, options) { diff --git a/web/kiri/index.css b/web/kiri/index.css index d1d83185..a369b0dd 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -839,6 +839,11 @@ th, tr, td { background-color: var(--bg-gray); height: 10px; } +.pop-sep { + height: 1.5px; + margin-top: 2px; + background-color: #bbb; +} .set-sep { background-color: var(--bg-gray) !important; height: 10px; diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 7c288f97..5c4f57be 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -262,11 +262,11 @@ kiri.lang['en-us'] = { cf_menu: "finishing", cf_angl_s: "max angle", cf_angl_l: "angles greater than this\nare considered vertical", - cf_watr_s: "waterline", + cf_watr_s: "enable waterline", cf_watr_l: "enable contour finishing\ndisabled when pocketing", - cf_linx_s: "linear x", + cf_linx_s: "enable linear x", cf_linx_l: "linear x-axis finishing", - cf_liny_s: "linear y", + cf_liny_s: "enable linear y", cf_liny_l: "linear y-axis finishing", cf_curv_s: "curves only", cf_curv_l: "limit linear cleanup\nto curved surfaces",