From 0b20ce9fb1d40c107002ab72711f8472be40150d Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 27 Oct 2020 12:00:58 -0400 Subject: [PATCH] re-order cam right menu. update free layout text to indicate non-operable in laser mode --- notes.md | 1 + src/kiri/init.js | 18 +++++++++--------- web/kiri/lang/en.js | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/notes.md b/notes.md index 3a300805..cc1dab7e 100644 --- a/notes.md +++ b/notes.md @@ -75,6 +75,7 @@ * `F` overcuts, radii for drag knives * `F` output option to uniquely color code each layer +* `F` add PLT / HP-GL output format (https://en.wikipedia.org/wiki/HP-GL) # References diff --git a/src/kiri/init.js b/src/kiri/init.js index e55c0ceb..71f6eec4 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1450,6 +1450,15 @@ camStockZ: UC.newInput(LANG.cs_hght_s, {title:LANG.cs_hght_l, convert:UC.toFloat, bound:UC.bound(0,9999), modes:CAM}), camStockOffset: UC.newBoolean(LANG.cs_offs_s, onBooleanClick, {title:LANG.cs_offs_l, modes:CAM}), + camCommon: UC.newGroup(LANG.cc_menu, null, {modes:CAM}), + camZTopOffset: UC.newInput(LANG.ou_ztof_s, {title:LANG.ou_ztof_l, convert:UC.toFloat, modes:CAM}), + camZBottom: UC.newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:UC.toFloat, modes:CAM}), + camZClearance: UC.newInput(LANG.ou_zclr_s, {title:LANG.ou_zclr_l, convert:UC.toFloat, bound:UC.bound(0.01,100), modes:CAM}), + camZThru: UC.newInput(LANG.ou_ztru_s, {title:LANG.ou_ztru_l, convert:UC.toFloat, bound:UC.bound(0.0,100), modes:CAM}), + camFastFeedZ: UC.newInput(LANG.cc_rzpd_s, {title:LANG.cc_rzpd_l, convert:UC.toInt, modes:CAM}), + camFastFeed: UC.newInput(LANG.cc_rapd_s, {title:LANG.cc_rapd_l, convert:UC.toInt, modes:CAM}), + camTolerance: UC.newInput(LANG.ou_toll_s, {title:LANG.ou_toll_l, convert:UC.toFloat, bound:UC.bound(0.001,1.0), modes:CAM}), + output: UC.newGroup(LANG.ou_menu, null, {modes:GCODE}), outputTileSpacing: UC.newInput(LANG.ou_spac_s, {title:LANG.ou_spac_l, convert:UC.toInt, modes:LASER}), outputTileScaling: UC.newInput(LANG.ou_scal_s, {title:LANG.ou_scal_l, convert:UC.toInt, bound:UC.bound(0.1,100), modes:LASER}), @@ -1476,15 +1485,6 @@ outputOriginCenter: UC.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:CAM_LASER}), camOriginTop: UC.newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l, modes:CAM}), - camCommon: UC.newGroup(LANG.cc_menu, null, {modes:CAM}), - camZTopOffset: UC.newInput(LANG.ou_ztof_s, {title:LANG.ou_ztof_l, convert:UC.toFloat, modes:CAM}), - camZBottom: UC.newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:UC.toFloat, modes:CAM}), - camZClearance: UC.newInput(LANG.ou_zclr_s, {title:LANG.ou_zclr_l, convert:UC.toFloat, bound:UC.bound(0.01,100), modes:CAM}), - camZThru: UC.newInput(LANG.ou_ztru_s, {title:LANG.ou_ztru_l, convert:UC.toFloat, bound:UC.bound(0.0,100), modes:CAM}), - camFastFeedZ: UC.newInput(LANG.cc_rzpd_s, {title:LANG.cc_rzpd_l, convert:UC.toInt, modes:CAM}), - camFastFeed: UC.newInput(LANG.cc_rapd_s, {title:LANG.cc_rapd_l, convert:UC.toInt, modes:CAM}), - camTolerance: UC.newInput(LANG.ou_toll_s, {title:LANG.ou_toll_l, convert:UC.toFloat, bound:UC.bound(0.001,1.0), modes:CAM}), - advanced: UC.newGroup(LANG.ad_menu, null, {modes:FDM, expert:true}), outputRetractDist: UC.newInput(LANG.ad_rdst_s, {title:LANG.ad_rdst_l, convert:UC.toFloat, modes:FDM, expert:true}), outputRetractSpeed: UC.newInput(LANG.ad_rrat_s, {title:LANG.ad_rrat_l, convert:UC.toInt, modes:FDM, expert:true}), diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index ddf4bf1d..4074b282 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -126,7 +126,7 @@ kiri.lang['en-us'] = { op_auto_s: "auto layout", op_auto_l: "automatically layout platform\nwhen new items added\nor when arrange clicked\nmore than once", op_free_s: "free layout", - op_free_l: "permit dragable layout", + op_free_l: "permit dragable layout\nno effect in laser mode", op_invr_s: "invert zoom", op_invr_l: "invert mouse wheel\nscroll zoom", op_thin_s: "thin lines",