allow multiple trace ops with different settings

This commit is contained in:
Stewart Allen 2020-12-24 12:59:57 -05:00
commit 46c225cd73
9 changed files with 95 additions and 280 deletions

View file

@ -1637,103 +1637,6 @@
(UI.ssmClr = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-trash-alt"></i>'}))
], {modes:FDM, class:"ext-buttons f-row"}),
// camRough: UC.newGroup(LANG.cr_menu, null, {modes:CAM, class:"rough"}),
// camRoughTool: UC.newSelect(LANG.cc_tool, {modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camRoughSpindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, modes:CAM, visible:spindleShow}),
// camRoughDown: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, modes:CAM, units:true}),
// camRoughOver: UC.newInput(LANG.cc_sovr_s, {title:LANG.cc_sovr_l, convert:UC.toFloat, bound:UC.bound(0.01,1.0), modes:CAM}),
// camRoughSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM, units:true}),
// camRoughPlunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, modes:CAM, units:true}),
// camRoughStock: UC.newInput(LANG.cr_lsto_s, {title:LANG.cr_lsto_l, convert:UC.toFloat, modes:CAM, units:true}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camRoughVoid: UC.newBoolean(LANG.cr_clrp_s, onBooleanClick, {title:LANG.cr_clrp_l, modes:CAM}),
// camRoughFlat: UC.newBoolean(LANG.cr_clrf_s, onBooleanClick, {title:LANG.cr_clrf_l, modes:CAM}),
// camRoughTop: UC.newBoolean(LANG.cr_clrt_s, onBooleanClick, {title:LANG.cr_clrt_l, modes:CAM}),
// camRoughIn: UC.newBoolean(LANG.cr_olin_s, onBooleanClick, {title:LANG.cr_olin_l, modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camRoughAdd: UC.newRow([
// UI.crAdd = UC.newButton('add', onButtonClick, {class: "f-col grow a-center"})
// ], { modes: CAM, class: "ext-buttons f-row grow" }),
//
// camOutline: UC.newGroup(LANG.co_menu, null, {modes:CAM, class:"outline"}),
// camOutlineTool: UC.newSelect(LANG.cc_tool, {modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camOutlineSpindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, modes:CAM, visible:spindleShow}),
// camOutlineDown: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, modes:CAM, units:true}),
// camOutlineOver: UC.newInput(LANG.cc_sovr_s, {title:LANG.cc_sovr_l, convert:UC.toFloat, modes:CAM, bound:UC.bound(0.01,1.0), units:true, show:() => { return UI.camOutlineWide.checked }}),
// camOutlineSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM, units:true}),
// camOutlinePlunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, modes:CAM, units:true}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camOutlineDogbone: UC.newBoolean(LANG.co_dogb_s, onBooleanClick, {title:LANG.co_dogb_l, modes:CAM, show:() => { return !UI.camOutlineWide.checked }}),
// camOutlineIn: UC.newBoolean(LANG.co_olin_s, onBooleanClick, {title:LANG.co_olin_l, modes:CAM, show:() => { return !UI.camOutlineOut.checked }}),
// camOutlineOut: UC.newBoolean(LANG.co_olot_s, onBooleanClick, {title:LANG.co_olot_l, modes:CAM, show:() => { return !UI.camOutlineIn.checked }}),
// camOutlineWide: UC.newBoolean(LANG.co_wide_s, onBooleanClick, {title:LANG.co_wide_l, modes:CAM, show:() => { return !UI.camOutlineIn.checked }}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camOutlineAdd: UC.newRow([
// UI.coAdd = UC.newButton('add', onButtonClick, {class: "f-col grow a-center"})
// ], { modes: CAM, class: "ext-buttons f-row grow" }),
//
// camContour: UC.newGroup(LANG.cn_menu, null, {modes:CAM}),
// camContourTool: UC.newSelect(LANG.cc_tool, {modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camContourSpindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, modes:CAM, visible:spindleShow}),
// camContourOver: UC.newInput(LANG.cc_sovr_s, {title:LANG.cc_sovr_l, convert:UC.toFloat, bound:UC.bound(0.01,1.0), modes:CAM}),
// camContourSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM, units:true}),
// camContourAngle: UC.newInput(LANG.cf_angl_s, {title:LANG.cf_angl_l, convert:UC.toFloat, bound:UC.bound(45,90), modes:CAM}),
// camTolerance: UC.newInput(LANG.ou_toll_s, {title:LANG.ou_toll_l, convert:UC.toFloat, bound:UC.bound(0,10.0), modes:CAM, units:true}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camContourCurves: UC.newBoolean(LANG.cf_curv_s, onBooleanClick, {title:LANG.cf_curv_l, modes:CAM}),
// camContourIn: UC.newBoolean(LANG.cf_olin_s, onBooleanClick, {title:LANG.cf_olin_l, modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camOutlineAdd: UC.newRow([
// UI.ccxAdd = UC.newButton('add x', onButtonClick, {class: "f-col grow a-center"}),
// UI.ccyAdd = UC.newButton('add y', onButtonClick, {class: "f-col grow a-center"})
// ], { modes: CAM, class: "ext-buttons f-row grow" }),
//
// camTracing: UC.newGroup(LANG.cu_menu, null, {modes:CAM}),
// camTraceTool: UC.newSelect(LANG.cc_tool, {modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camTraceType: UC.newSelect(LANG.cu_type_s, {title:LANG.cu_type_l, modes:CAM}, "trace"),
// camTraceSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM}),
// camTracePlunge: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toFloat, modes:CAM, units:true}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camTraceSelect: UC.newRow([
// (UI.traceAdd = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-plus"></i>'})),
// (UI.traceDun = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})),
// (UI.traceClr = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-trash-alt"></i>'}))
// ], {modes:CAM, class:"ext-buttons f-row"}),
//
// camDrill: UC.newGroup(LANG.cd_menu, null, {modes:CAM}),
// camDrillTool: UC.newSelect(LANG.cc_tool, {modes:CAM}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camDrillSpindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, modes:CAM, visible:spindleShow}),
// camDrillDown: UC.newInput(LANG.cd_plpr_s, {title:LANG.cd_plpr_l, convert:UC.toFloat, modes:CAM, units:true}),
// camDrillDownSpeed: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toFloat, modes:CAM, units:true}),
// camDrillDwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat, modes:CAM}),
// camDrillLift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, modes:CAM, units:true}),
// camSep: UC.newBlank({class:"pop-sep"}),
// // camDrillingOn: UC.newBoolean(LANG.enable, onBooleanClick, {modes:CAM}),
// camDrillAdd: UC.newRow([
// UI.drAdd = UC.newButton('add', onButtonClick, {class: "f-col grow a-center"})
// ], { modes: CAM, class: "ext-buttons f-row grow" }),
// camSep: UC.newBlank({class:"pop-sep"}),
// camSep: UC.newBlank({class:"pop-sep"}),
// camDrillAdd: UC.newRow([
// UC.newLabel('registrations', {class: "f-col grow center"})
// ], { modes: CAM, class: "ext-buttons f-row" }),
// // camDrillReg: UC.newSelect(LANG.cd_regi_s, {modes:CAM, title:LANG.cd_regi_l}, "drillreg"),
// camDrillAdd: UC.newRow([
// UI.drX2Add = UC.newButton('x axis 2', onButtonClick, {class: "f-col grow a-center"}),
// UI.drX3Add = UC.newButton('x axis 3', onButtonClick, {class: "f-col grow a-center"}),
// ], { modes: CAM, xclass: "ext-buttons f-row grow" }),
// camDrillAdd: UC.newRow([
// UI.drY2Add = UC.newButton('y axis 2', onButtonClick, {class: "f-col grow a-center"}),
// UI.drY3Add = UC.newButton('y axis 3', onButtonClick, {class: "f-col grow a-center"}),
// ], { modes: CAM, xclass: "ext-buttons f-row grow" }),
//
// camSep1: UC.newGroup(null, null, {modes:CAM, class:"set-sep"}),
camTabs: UC.newGroup(LANG.ct_menu, null, {modes:CAM, marker:true}),
camTabsWidth: UC.newInput(LANG.ct_wdth_s, {title:LANG.ct_wdth_l, convert:UC.toFloat, bound:UC.bound(0.005,100), modes:CAM, units:true}),
camTabsHeight: UC.newInput(LANG.ct_hght_s, {title:LANG.ct_hght_l, convert:UC.toFloat, bound:UC.bound(0.005,100), modes:CAM, units:true}),