AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix adding cnc ops

Browse source
This commit is contained in:
Stewart Allen 2024-05-28 18:02:52 -04:00
commit c7456c7736
7 changed files with 313 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri-mode/cam/client.js
View file

@ -274,7 +274,7 @@ CAM.init = function(kiri, api) {
$('op-add-list').onclick = (ev) => { $('op-add-list').onclick = (ev) => {
let settings = API.conf.get(); let settings = API.conf.get();
let { process, device } = settings; let { process, device } = settings;
switch (ev.target.innerText) { switch (ev.target.innerText.toLowerCase()) {
case "index": return func.opAddIndex(); case "index": return func.opAddIndex();
case "laser on": return func.opAddLaserOn(); case "laser on": return func.opAddLaserOn();
case "laser off": return func.opAddLaserOff(); case "laser off": return func.opAddLaserOff();

48
src/kiri/init.js
View file

@ -39,6 +39,7 @@ gapp.register("kiri.init", [], (root, exports) => {
LASER = [MODES.LASER], LASER = [MODES.LASER],
proto = location.protocol, proto = location.protocol,
ver = Date.now().toString(36), ver = Date.now().toString(36),
separator = true,
driven = true; driven = true;
let currentDevice = null, let currentDevice = null,
@ -1646,7 +1647,7 @@ gapp.register("kiri.init", [], (root, exports) => {
context: $('context-menu'), context: $('context-menu'),
options: { options: {
area: $('lt-options'), // area: $('lt-options'),
trash: $('lt-trash'), trash: $('lt-trash'),
enable: $('lt-w-enable'), enable: $('lt-w-enable'),
disable: $('lt-w-disable'), disable: $('lt-w-disable'),
@ -1843,7 +1844,7 @@ gapp.register("kiri.init", [], (root, exports) => {
/** FDM Settings */ /** FDM Settings */
process: newGroup(LANG.sl_menu, $('fdm-layers'), { modes:FDM, driven }), process: newGroup(LANG.sl_menu, $('fdm-layers'), { modes:FDM, driven, separator }),
sliceHeight: newInput(LANG.sl_lahi_s, { title:LANG.sl_lahi_l, convert:toFloat }), 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}), 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 }), sliceShells: newInput(LANG.sl_shel_s, { title:LANG.sl_shel_l, convert:toFloat }),
@ -1854,8 +1855,7 @@ gapp.register("kiri.init", [], (root, exports) => {
separator: newBlank({ class:"set-sep", driven }), separator: newBlank({ class:"set-sep", driven }),
sliceDetectThin: newSelect(LANG.ad_thin_s, { title: LANG.ad_thin_l, action: thinWallSave }, "thin"), 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}), 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 }),
firstLayer: newGroup(LANG.fl_menu, $('fdm-base'), { modes:FDM, driven }),
firstSliceHeight: newInput(LANG.fl_lahi_s, {title:LANG.fl_lahi_l, convert:toFloat, show:isNotBelt}), 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}), 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}), firstLayerBedTemp: newInput(LANG.fl_bedd_s, {title:LANG.fl_bedd_l, convert:toInt, show:isNotBelt}),
@ -1878,7 +1878,7 @@ gapp.register("kiri.init", [], (root, exports) => {
separator: newBlank({ class:"set-sep", driven }), separator: newBlank({ class:"set-sep", driven }),
outputRaft: newBoolean(LANG.fr_nabl_s, onBooleanClick, {title:LANG.fr_nabl_l, trigger: true, show:() => isNotBelt()}), 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()}), 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 }), fdmInfill: newGroup(LANG.fi_menu, $('fdm-fill'), { modes:FDM, driven, separator }),
sliceFillType: newSelect(LANG.fi_type, {trigger:true}, "infill"), 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)}), 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}), sliceFillRepeat: newInput(LANG.fi_rept_s, {title:LANG.fi_rept_l, convert:toInt, bound:bound(1,10), show:fillShow}),
@ -1887,7 +1887,7 @@ gapp.register("kiri.init", [], (root, exports) => {
sliceSolidRate: newInput(LANG.ou_fini_s, {title:LANG.ou_fini_l, convert:toInt, bound:bound(0,500)}), 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}), 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}), 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 }), fdmSupport: newGroup(LANG.sp_menu, $('fdm-support'), { modes:FDM, marker:false, driven, separator }),
sliceSupportNozzle: newSelect(LANG.sp_nozl_s, {title:LANG.sp_nozl_l}, "extruders"), 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)}), 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)}), sliceSupportSize: newInput(LANG.sp_size_s, {title:LANG.sp_size_l, convert:toFloat, bound:bound(1.0,200.0)}),
@ -1910,7 +1910,7 @@ gapp.register("kiri.init", [], (root, exports) => {
(ui.ssmDun = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})), (ui.ssmDun = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})),
(ui.ssmClr = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-trash-alt"></i>'})) (ui.ssmClr = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-trash-alt"></i>'}))
], {class:"ext-buttons f-row"}), ], {class:"ext-buttons f-row"}),
fdmOutput: newGroup(LANG.ou_menu, $('fdm-output'), { modes:FDM, driven }), fdmOutput: newGroup(LANG.ou_menu, $('fdm-output'), { modes:FDM, driven, separator }),
outputTemp: newInput(LANG.ou_nozl_s, {title:LANG.ou_nozl_l, convert:toInt}), 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}), 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)}), outputFanSpeed: newInput(LANG.ou_fans_s, {title:LANG.ou_fans_l, convert:toInt, bound:bound(0,255)}),
@ -1927,7 +1927,7 @@ gapp.register("kiri.init", [], (root, exports) => {
outputAvoidGaps: newBoolean(LANG.ad_agap_s, onBooleanClick, {title:LANG.ad_agap_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}), 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}), outputBeltFirst: newBoolean(LANG.ad_lbir_s, onBooleanClick, {title:LANG.ad_lbir_l, show: isBelt}),
fdmExpert: newGroup(LANG.ad_menu, $('fdm-expert'), { modes:FDM, driven }), fdmExpert: newGroup(LANG.ad_menu, $('fdm-expert'), { modes:FDM, driven, separator }),
outputRetractDist: newInput(LANG.ad_rdst_s, {title:LANG.ad_rdst_l, convert:toFloat}), 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}), 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)}), outputRetractWipe: newInput(LANG.ad_wpln_s, {title:LANG.ad_wpln_l, convert:toFloat, bound:bound(0.0,10)}),
@ -1946,7 +1946,7 @@ gapp.register("kiri.init", [], (root, exports) => {
/** CAM Settings */ /** CAM Settings */
camTabs: newGroup(LANG.ct_menu, $('cam-tabs'), { modes:CAM, marker:true, driven }), camTabs: newGroup(LANG.ct_menu, $('cam-tabs'), { modes:CAM, marker:true, driven, separator }),
camTabsWidth: newInput(LANG.ct_wdth_s, {title:LANG.ct_wdth_l, convert:toFloat, bound:bound(0.005,100), units:true}), camTabsWidth: newInput(LANG.ct_wdth_s, {title:LANG.ct_wdth_l, convert:toFloat, bound:bound(0.005,100), units:true}),
camTabsHeight: newInput(LANG.ct_hght_s, {title:LANG.ct_hght_l, convert:toFloat, bound:bound(0.005,100), units:true}), camTabsHeight: newInput(LANG.ct_hght_s, {title:LANG.ct_hght_l, convert:toFloat, bound:bound(0.005,100), units:true}),
camTabsDepth: newInput(LANG.ct_dpth_s, {title:LANG.ct_dpth_l, convert:toFloat, bound:bound(0.005,100), units:true}), camTabsDepth: newInput(LANG.ct_dpth_s, {title:LANG.ct_dpth_l, convert:toFloat, bound:bound(0.005,100), units:true}),
@ -1958,7 +1958,7 @@ gapp.register("kiri.init", [], (root, exports) => {
(ui.tabDun = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})), (ui.tabDun = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-check"></i>'})),
(ui.tabClr = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-trash-alt"></i>'})) (ui.tabClr = newButton(undefined, onButtonClick, {icon:'<i class="fas fa-trash-alt"></i>'}))
], {class:"ext-buttons f-row"}), ], {class:"ext-buttons f-row"}),
camStock: newGroup(LANG.cs_menu, $('cam-stock'), { modes:CAM, driven }), camStock: newGroup(LANG.cs_menu, $('cam-stock'), { modes:CAM, driven, separator }),
camStockX: newInput(LANG.cs_wdth_s, {title:LANG.cs_wdth_l, convert:toFloat, bound:bound(0,9999), units:true}), camStockX: newInput(LANG.cs_wdth_s, {title:LANG.cs_wdth_l, convert:toFloat, bound:bound(0,9999), units:true}),
camStockY: newInput(LANG.cs_dpth_s, {title:LANG.cs_dpth_l, convert:toFloat, bound:bound(0,9999), units:true}), camStockY: newInput(LANG.cs_dpth_s, {title:LANG.cs_dpth_l, convert:toFloat, bound:bound(0,9999), units:true}),
camStockZ: newInput(LANG.cs_hght_s, {title:LANG.cs_hght_l, convert:toFloat, bound:bound(0,9999), units:true}), camStockZ: newInput(LANG.cs_hght_s, {title:LANG.cs_hght_l, convert:toFloat, bound:bound(0,9999), units:true}),
@ -1967,7 +1967,7 @@ gapp.register("kiri.init", [], (root, exports) => {
camStockClipTo: newBoolean(LANG.cs_clip_s, onBooleanClick, {title:LANG.cs_clip_l}), camStockClipTo: newBoolean(LANG.cs_clip_s, onBooleanClick, {title:LANG.cs_clip_l}),
camStockIndexed: newBoolean(LANG.cs_indx_s, onBooleanClick, {title:LANG.cs_indx_l}), camStockIndexed: newBoolean(LANG.cs_indx_s, onBooleanClick, {title:LANG.cs_indx_l}),
camStockIndexGrid: newBoolean(LANG.cs_ishg_s, onBooleanClick, {title:LANG.cs_ishg_l, show:() => ui.camStockIndexed.checked}), camStockIndexGrid: newBoolean(LANG.cs_ishg_s, onBooleanClick, {title:LANG.cs_ishg_l, show:() => ui.camStockIndexed.checked}),
camLimits: newGroup(LANG.cc_menu, $('cam-limits'), { modes:CAM, driven }), camLimits: newGroup(LANG.cc_menu, $('cam-limits'), { modes:CAM, driven, separator }),
camZAnchor: newSelect(LANG.ou_zanc_s, {title: LANG.ou_zanc_l, action:zAnchorSave, trace:true, show:() => !ui.camStockIndexed.checked}, "zanchor"), camZAnchor: newSelect(LANG.ou_zanc_s, {title: LANG.ou_zanc_l, action:zAnchorSave, trace:true, show:() => !ui.camStockIndexed.checked}, "zanchor"),
camZOffset: newInput(LANG.ou_ztof_s, {title:LANG.ou_ztof_l, convert:toFloat, units:true}), camZOffset: newInput(LANG.ou_ztof_s, {title:LANG.ou_ztof_l, convert:toFloat, units:true}),
camZBottom: newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:toFloat, units:true, trigger: true}), camZBottom: newInput(LANG.ou_zbot_s, {title:LANG.ou_zbot_l, convert:toFloat, units:true, trigger: true}),
@ -1975,43 +1975,43 @@ gapp.register("kiri.init", [], (root, exports) => {
camZClearance: newInput(LANG.ou_zclr_s, {title:LANG.ou_zclr_l, convert:toFloat, bound:bound(0.01,100), units:true}), camZClearance: newInput(LANG.ou_zclr_s, {title:LANG.ou_zclr_l, convert:toFloat, bound:bound(0.01,100), units:true}),
camFastFeedZ: newInput(LANG.cc_rzpd_s, {title:LANG.cc_rzpd_l, convert:toFloat, units:true}), camFastFeedZ: newInput(LANG.cc_rzpd_s, {title:LANG.cc_rzpd_l, convert:toFloat, units:true}),
camFastFeed: newInput(LANG.cc_rapd_s, {title:LANG.cc_rapd_l, convert:toFloat, units:true}), camFastFeed: newInput(LANG.cc_rapd_s, {title:LANG.cc_rapd_l, convert:toFloat, units:true}),
camOutput: newGroup(LANG.ou_menu, $('cam-output'), { modes:CAM, driven }), camOutput: newGroup(LANG.ou_menu, $('cam-output'), { modes:CAM, driven, separator }),
camConventional: newBoolean(LANG.ou_conv_s, onBooleanClick, {title:LANG.ou_conv_l}), camConventional: newBoolean(LANG.ou_conv_s, onBooleanClick, {title:LANG.ou_conv_l}),
camEaseDown: newBoolean(LANG.cr_ease_s, onBooleanClick, {title:LANG.cr_ease_l}), camEaseDown: newBoolean(LANG.cr_ease_s, onBooleanClick, {title:LANG.cr_ease_l}),
camDepthFirst: newBoolean(LANG.ou_depf_s, onBooleanClick, {title:LANG.ou_depf_l}), camDepthFirst: newBoolean(LANG.ou_depf_s, onBooleanClick, {title:LANG.ou_depf_l}),
camToolInit: newBoolean(LANG.ou_toin_s, onBooleanClick, {title:LANG.ou_toin_l}), camToolInit: newBoolean(LANG.ou_toin_s, onBooleanClick, {title:LANG.ou_toin_l}),
camFirstZMax: newBoolean(LANG.ou_z1st_s, onBooleanClick, {title:LANG.ou_z1st_l}), camFirstZMax: newBoolean(LANG.ou_z1st_s, onBooleanClick, {title:LANG.ou_z1st_l}),
camForceZMax: newBoolean(LANG.ou_forz_s, onBooleanClick, {title:LANG.ou_forz_l}), camForceZMax: newBoolean(LANG.ou_forz_s, onBooleanClick, {title:LANG.ou_forz_l}),
camOrigin: newGroup(LANG.co_menu, $('cam-origin'), { modes:CAM, driven }), camOrigin: newGroup(LANG.co_menu, $('cam-origin'), { modes:CAM, driven, separator }),
camOriginOffX: newInput(LANG.co_offx_s, {title:LANG.co_offx_l, convert:toFloat, units:true}), camOriginOffX: newInput(LANG.co_offx_s, {title:LANG.co_offx_l, convert:toFloat, units:true}),
camOriginOffY: newInput(LANG.co_offy_s, {title:LANG.co_offy_l, convert:toFloat, units:true}), camOriginOffY: newInput(LANG.co_offy_s, {title:LANG.co_offy_l, convert:toFloat, units:true}),
camOriginOffZ: newInput(LANG.co_offz_s, {title:LANG.co_offz_l, convert:toFloat, units:true}), camOriginOffZ: newInput(LANG.co_offz_s, {title:LANG.co_offz_l, convert:toFloat, units:true}),
separator: newBlank({ class:"set-sep", driven }), separator: newBlank({ class:"set-sep", driven }),
camOriginTop: newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l}), camOriginTop: newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l}),
camOriginCenter: newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l}), camOriginCenter: newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l}),
camExpert: newGroup(LANG.op_xprt_s, $('cam-expert'), { group: "cam_expert", modes:CAM, marker: false, driven }), camExpert: newGroup(LANG.op_xprt_s, $('cam-expert'), { group: "cam_expert", modes:CAM, marker: false, driven, separator }),
camExpertFast: newBoolean(LANG.cx_fast_s, onBooleanClick, {title:LANG.cx_fast_l, show: () => !ui.camTrueShadow.checked }), camExpertFast: newBoolean(LANG.cx_fast_s, onBooleanClick, {title:LANG.cx_fast_l, show: () => !ui.camTrueShadow.checked }),
camTrueShadow: newBoolean(LANG.cx_true_s, onBooleanClick, {title:LANG.cx_true_l, show: () => !ui.camExpertFast.checked }), camTrueShadow: newBoolean(LANG.cx_true_s, onBooleanClick, {title:LANG.cx_true_l, show: () => !ui.camExpertFast.checked }),
/** LASER Settings */ /** LASER Settings */
laserMode: newGroup(LANG.sl_menu, $('lzr-slice'), { modes:LASER, driven }), laserMode: newGroup(LANG.sl_menu, $('lzr-slice'), { modes:LASER, driven, separator }),
laserOffset: newInput(LANG.ls_offs_s, {title:LANG.ls_offs_l, convert:toFloat}), laserOffset: newInput(LANG.ls_offs_s, {title:LANG.ls_offs_l, convert:toFloat}),
laserSliceHeight: newInput(LANG.ls_lahi_s, {title:LANG.ls_lahi_l, convert:toFloat, trigger: true}), laserSliceHeight: newInput(LANG.ls_lahi_s, {title:LANG.ls_lahi_l, convert:toFloat, trigger: true}),
laserSliceHeightMin: newInput(LANG.ls_lahm_s, {title:LANG.ls_lahm_l, convert:toFloat, show:() => { return ui.laserSliceHeight.value == 0 }}), laserSliceHeightMin: newInput(LANG.ls_lahm_s, {title:LANG.ls_lahm_l, convert:toFloat, show:() => { return ui.laserSliceHeight.value == 0 }}),
separator: newBlank({ class:"set-sep", driven }), separator: newBlank({ class:"set-sep", driven }),
laserSliceSingle: newBoolean(LANG.ls_sngl_s, onBooleanClick, {title:LANG.ls_sngl_l}), laserSliceSingle: newBoolean(LANG.ls_sngl_s, onBooleanClick, {title:LANG.ls_sngl_l}),
laserLayout: newGroup(LANG.lo_menu, $('lzr-layout'), { modes:LASER, driven }), laserLayout: newGroup(LANG.lo_menu, $('lzr-layout'), { modes:LASER, driven, separator }),
outputTileSpacing: newInput(LANG.ou_spac_s, {title:LANG.ou_spac_l, convert:toInt}), outputTileSpacing: newInput(LANG.ou_spac_s, {title:LANG.ou_spac_l, convert:toInt}),
outputLaserMerged: newBoolean(LANG.ou_mrgd_s, onBooleanClick, {title:LANG.ou_mrgd_l}), outputLaserMerged: newBoolean(LANG.ou_mrgd_s, onBooleanClick, {title:LANG.ou_mrgd_l}),
outputLaserGroup: newBoolean(LANG.ou_grpd_s, onBooleanClick, {title:LANG.ou_grpd_l}), outputLaserGroup: newBoolean(LANG.ou_grpd_s, onBooleanClick, {title:LANG.ou_grpd_l}),
knife: newGroup(LANG.dk_menu, $('lzr-knife'), { modes:LASER, marker:true, driven }), knife: newGroup(LANG.dk_menu, $('lzr-knife'), { modes:LASER, marker:true, driven, separator }),
outputKnifeDepth: newInput(LANG.dk_dpth_s, {title:LANG.dk_dpth_l, convert:toFloat, bound:bound(0.0,5.0)}), outputKnifeDepth: newInput(LANG.dk_dpth_s, {title:LANG.dk_dpth_l, convert:toFloat, bound:bound(0.0,5.0)}),
outputKnifePasses: newInput(LANG.dk_pass_s, {title:LANG.dk_pass_l, convert:toInt, bound:bound(0,5)}), outputKnifePasses: newInput(LANG.dk_pass_s, {title:LANG.dk_pass_l, convert:toInt, bound:bound(0,5)}),
outputKnifeTip: newInput(LANG.dk_offs_s, {title:LANG.dk_offs_l, convert:toFloat, bound:bound(0.0,10.0)}), outputKnifeTip: newInput(LANG.dk_offs_s, {title:LANG.dk_offs_l, convert:toFloat, bound:bound(0.0,10.0)}),
separator: newBlank({ class:"set-sep", driven }), separator: newBlank({ class:"set-sep", driven }),
knifeOn: newBoolean(LANG.enable, onBooleanClick, {title:LANG.ou_drkn_l}), knifeOn: newBoolean(LANG.enable, onBooleanClick, {title:LANG.ou_drkn_l}),
laserOutput: newGroup(LANG.ou_menu, $('lzr-output'), { modes:LASER, driven }), laserOutput: newGroup(LANG.ou_menu, $('lzr-output'), { modes:LASER, driven, separator }),
outputLaserPower: newInput(LANG.ou_powr_s, {title:LANG.ou_powr_l, convert:toInt, bound:bound(1,100)}), outputLaserPower: newInput(LANG.ou_powr_s, {title:LANG.ou_powr_l, convert:toInt, bound:bound(1,100)}),
outputLaserSpeed: newInput(LANG.ou_sped_s, {title:LANG.ou_sped_l, convert:toInt}), outputLaserSpeed: newInput(LANG.ou_sped_s, {title:LANG.ou_sped_l, convert:toInt}),
separator: newBlank({ class:"set-sep", driven }), separator: newBlank({ class:"set-sep", driven }),
@ -2024,34 +2024,34 @@ gapp.register("kiri.init", [], (root, exports) => {
/** SLA SETTINGS */ /** SLA SETTINGS */
slaProc: newGroup(LANG.sa_menu, $('sla-slice'), { modes:SLA, group:"sla-slice", driven }), slaProc: newGroup(LANG.sa_menu, $('sla-slice'), { modes:SLA, group:"sla-slice", driven, separator }),
slaSlice: newInput(LANG.sa_lahe_s, {title:LANG.sa_lahe_l, convert:toFloat}), slaSlice: newInput(LANG.sa_lahe_s, {title:LANG.sa_lahe_l, convert:toFloat}),
slaShell: newInput(LANG.sa_shel_s, {title:LANG.sa_shel_l, convert:toFloat}), slaShell: newInput(LANG.sa_shel_s, {title:LANG.sa_shel_l, convert:toFloat}),
slaOpenTop: newBoolean(LANG.sa_otop_s, onBooleanClick, {title:LANG.sa_otop_l}), slaOpenTop: newBoolean(LANG.sa_otop_s, onBooleanClick, {title:LANG.sa_otop_l}),
slaOpenBase: newBoolean(LANG.sa_obas_s, onBooleanClick, {title:LANG.sa_obas_l}), slaOpenBase: newBoolean(LANG.sa_obas_s, onBooleanClick, {title:LANG.sa_obas_l}),
slaLayers: newGroup(LANG.sa_layr_m, $('sla-layers'), { modes:SLA, group:"sla-layers", driven }), slaLayers: newGroup(LANG.sa_layr_m, $('sla-layers'), { modes:SLA, group:"sla-layers", driven, separator }),
slaLayerOn: newInput(LANG.sa_lton_s, {title:LANG.sa_lton_l, convert:toFloat}), slaLayerOn: newInput(LANG.sa_lton_s, {title:LANG.sa_lton_l, convert:toFloat}),
slaLayerOff: newInput(LANG.sa_ltof_s, {title:LANG.sa_ltof_l, convert:toFloat}), slaLayerOff: newInput(LANG.sa_ltof_s, {title:LANG.sa_ltof_l, convert:toFloat}),
slaPeelDist: newInput(LANG.sa_pldi_s, {title:LANG.sa_pldi_l, convert:toFloat}), slaPeelDist: newInput(LANG.sa_pldi_s, {title:LANG.sa_pldi_l, convert:toFloat}),
slaPeelLiftRate: newInput(LANG.sa_pllr_s, {title:LANG.sa_pllr_l, convert:toFloat}), slaPeelLiftRate: newInput(LANG.sa_pllr_s, {title:LANG.sa_pllr_l, convert:toFloat}),
slaPeelDropRate: newInput(LANG.sa_pldr_s, {title:LANG.sa_pldr_l, convert:toFloat}), slaPeelDropRate: newInput(LANG.sa_pldr_s, {title:LANG.sa_pldr_l, convert:toFloat}),
slaBase: newGroup(LANG.sa_base_m, $('sla-base'), { modes:SLA, group:"sla-base", driven }), slaBase: newGroup(LANG.sa_base_m, $('sla-base'), { modes:SLA, group:"sla-base", driven, separator }),
slaBaseLayers: newInput(LANG.sa_balc_s, {title:LANG.sa_balc_l, convert:toInt}), slaBaseLayers: newInput(LANG.sa_balc_s, {title:LANG.sa_balc_l, convert:toInt}),
slaBaseOn: newInput(LANG.sa_lton_s, {title:LANG.sa_bltn_l, convert:toFloat}), slaBaseOn: newInput(LANG.sa_lton_s, {title:LANG.sa_bltn_l, convert:toFloat}),
slaBaseOff: newInput(LANG.sa_ltof_s, {title:LANG.sa_bltf_l, convert:toFloat}), slaBaseOff: newInput(LANG.sa_ltof_s, {title:LANG.sa_bltf_l, convert:toFloat}),
slaBasePeelDist: newInput(LANG.sa_pldi_s, {title:LANG.sa_pldi_l, convert:toFloat}), slaBasePeelDist: newInput(LANG.sa_pldi_s, {title:LANG.sa_pldi_l, convert:toFloat}),
slaBasePeelLiftRate: newInput(LANG.sa_pllr_s, {title:LANG.sa_pllr_l, convert:toFloat}), slaBasePeelLiftRate: newInput(LANG.sa_pllr_s, {title:LANG.sa_pllr_l, convert:toFloat}),
slaFill: newGroup(LANG.sa_infl_m, $('sla-fill'), { modes:SLA, group:"sla-infill", driven }), slaFill: newGroup(LANG.sa_infl_m, $('sla-fill'), { modes:SLA, group:"sla-infill", driven, separator }),
slaFillDensity: newInput(LANG.sa_ifdn_s, {title:LANG.sa_ifdn_l, convert:toFloat, bound:bound(0,1)}), slaFillDensity: newInput(LANG.sa_ifdn_s, {title:LANG.sa_ifdn_l, convert:toFloat, bound:bound(0,1)}),
slaFillLine: newInput(LANG.sa_iflw_s, {title:LANG.sa_iflw_l, convert:toFloat, bound:bound(0,5)}), slaFillLine: newInput(LANG.sa_iflw_s, {title:LANG.sa_iflw_l, convert:toFloat, bound:bound(0,5)}),
slaSupport: newGroup(LANG.sa_supp_m, $('sla-support'), { modes:SLA, group:"sla-support", driven }), slaSupport: newGroup(LANG.sa_supp_m, $('sla-support'), { modes:SLA, group:"sla-support", driven, separator }),
slaSupportLayers: newInput(LANG.sa_slyr_s, {title:LANG.sa_slyr_l, convert:toInt, bound:bound(5,100)}), slaSupportLayers: newInput(LANG.sa_slyr_s, {title:LANG.sa_slyr_l, convert:toInt, bound:bound(5,100)}),
slaSupportGap: newInput(LANG.sa_slgp_s, {title:LANG.sa_slgp_l, convert:toInt, bound:bound(3,30)}), slaSupportGap: newInput(LANG.sa_slgp_s, {title:LANG.sa_slgp_l, convert:toInt, bound:bound(3,30)}),
slaSupportDensity: newInput(LANG.sa_sldn_s, {title:LANG.sa_sldn_l, convert:toFloat, bound:bound(0.01,0.9)}), slaSupportDensity: newInput(LANG.sa_sldn_s, {title:LANG.sa_sldn_l, convert:toFloat, bound:bound(0.01,0.9)}),
slaSupportSize: newInput(LANG.sa_slsz_s, {title:LANG.sa_slsz_l, convert:toFloat, bound:bound(0.1,1)}), slaSupportSize: newInput(LANG.sa_slsz_s, {title:LANG.sa_slsz_l, convert:toFloat, bound:bound(0.1,1)}),
slaSupportPoints: newInput(LANG.sa_slpt_s, {title:LANG.sa_slpt_l, convert:toInt, bound:bound(3,10)}), slaSupportPoints: newInput(LANG.sa_slpt_s, {title:LANG.sa_slpt_l, convert:toInt, bound:bound(3,10)}),
slaSupportEnable: newBoolean(LANG.enable, onBooleanClick, {title:LANG.sl_slen_l}), slaSupportEnable: newBoolean(LANG.enable, onBooleanClick, {title:LANG.sl_slen_l}),
slaOutput: newGroup(LANG.sa_outp_m, $('sla-output'), { modes:SLA, group:"sla-first", driven }), slaOutput: newGroup(LANG.sa_outp_m, $('sla-output'), { modes:SLA, group:"sla-first", driven, separator }),
slaFirstOffset: newInput(LANG.sa_opzo_s, {title:LANG.sa_opzo_l, convert:toFloat, bound:bound(0,1)}), slaFirstOffset: newInput(LANG.sa_opzo_s, {title:LANG.sa_opzo_l, convert:toFloat, bound:bound(0,1)}),
slaAntiAlias: newSelect(LANG.sa_opaa_s, {title:LANG.sa_opaa_l}, "antialias"), slaAntiAlias: newSelect(LANG.sa_opaa_s, {title:LANG.sa_opaa_l}, "antialias"),

5
src/kiri/main.js
View file

@ -962,8 +962,9 @@ gapp.register("kiri.main", [], (root, exports) => {
} }
function setControlsVisible(show) { function setControlsVisible(show) {
$('mid-left').style.display = show ? 'flex' : 'none'; // TODO fix
$('mid-right').style.display = show ? 'flex' : 'none'; // $('mid-left').style.display = show ? 'flex' : 'none';
// $('mid-right').style.display = show ? 'flex' : 'none';
} }
function downloadBlob(data, filename) { function downloadBlob(data, filename) {

4
src/kiri/platform.js
View file

@ -234,14 +234,12 @@ function platformUpdateSelected() {
const { device } = settings; const { device } = settings;
const { extruders } = device; const { extruders } = device;
const { selection, ui } = api; const { selection, ui } = api;
const { area, enable, disable } = ui.options; const { enable, disable } = ui.options;
const selreal = selection.widgets(); const selreal = selection.widgets();
const selwid = selection.widgets(true); const selwid = selection.widgets(true);
const selcount = selwid.length; const selcount = selwid.length;
area.style.display = selreal.length ? 'flex' : '';
if (selcount) { if (selcount) {
let enaC = selwid.filter(w => w.meta.disabled !== true).length; let enaC = selwid.filter(w => w.meta.disabled !== true).length;
let disC = selwid.filter(w => w.meta.disabled === true).length; let disC = selwid.filter(w => w.meta.disabled === true).length;

22
src/kiri/ui.js
View file

@ -251,6 +251,17 @@ gapp.register("kiri.ui", [], (root, exports) => {
dbkey = `beta-${prefix}-show-${group}`, dbkey = `beta-${prefix}-show-${group}`,
link; link;
// if (opt.separator) {
// const sep = DOC.createElement('div');
// sep.classList.add('set2-sep');
// sep.innerHTML = [
// '<div class="line-sep2"></div>',
// '<div class="chonk"></div>',
// '<div class="line-sep2"></div>',
// ].join('');
// lastDiv.appendChild(sep);
// }
if (opt.class) { if (opt.class) {
opt.class.split(' ').forEach(ce => { opt.class.split(' ').forEach(ce => {
row.classList.add(ce); row.classList.add(ce);
@ -272,6 +283,17 @@ gapp.register("kiri.ui", [], (root, exports) => {
row.appendChild(link); row.appendChild(link);
} }
if (opt.separator) {
const sep = DOC.createElement('div');
sep.classList.add('set2-sep');
sep.innerHTML = [
'<div class="line-sep2"></div>',
'<div class="chonk2"></div>',
'<div class="line-sep2"></div>',
].join('');
lastDiv.appendChild(sep);
}
addModeControls(row, opt); addModeControls(row, opt);
lastGroup = groups[group] = []; lastGroup = groups[group] = [];
lastGroup.key = dbkey; lastGroup.key = dbkey;

123
web/kiri/index.css
View file

@ -3,6 +3,7 @@
--bg-gray: rgba(0,0,0,0.25); --bg-gray: rgba(0,0,0,0.25);
--bg-gray-lt: rgba(0,0,0,0.15); --bg-gray-lt: rgba(0,0,0,0.15);
--gradbar: linear-gradient(to right, #ddd, #666, #ddd); --gradbar: linear-gradient(to right, #ddd, #666, #ddd);
--gradbar2: linear-gradient(to right, #ddd, #999, #ddd);
--gradbar-vert: linear-gradient(to bottom, #ddd, #666, #ddd); --gradbar-vert: linear-gradient(to bottom, #ddd, #666, #ddd);
--holdbar: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,1), rgba(100,100,100,0.1)); --holdbar: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,1), rgba(100,100,100,0.1));
--holdbar-dk: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,0.25), rgba(100,100,100,0.1)); --holdbar-dk: linear-gradient(to top, rgba(100,100,100,0.1), rgba(255,255,255,0.25), rgba(100,100,100,0.1));
@ -179,6 +180,10 @@ th, tr, td, label {
bottom: 0; bottom: 0;
} }
#app-name .km-font {
font-size: larger;
}
/* top menu bar, drop menus */ /* top menu bar, drop menus */
#top, #app-name { #top, #app-name {
background-color: var(--work-area); background-color: var(--work-area);
@ -514,6 +519,15 @@ th, tr, td, label {
/* border-top: 3px dashed black; */ /* border-top: 3px dashed black; */
background-color: var(--bg-gray-lt); background-color: var(--bg-gray-lt);
} }
.chonk2 {
/* margin: 10px 0 10px 0; */
/* height: 0px; */
min-height: 3px;
max-height: 3px;
min-width: 100px;
/* border-top: 3px dashed black; */
background-color: var(--bg-gray-lt);
}
#mode-info { #mode-info {
white-space: nowrap; white-space: nowrap;
font-size: smaller; font-size: smaller;
@ -641,20 +655,17 @@ th, tr, td, label {
text-transform: none !important; text-transform: none !important;
} }
#mid-left, #right-work { #panel-left, #panel-right {
max-height: 100%; max-height: 100%;
background-color: var(--work-area); background-color: var(--work-area);
} }
#mid-left, #mid-right, #modal { #panel-left, #panel-right, #modal {
pointer-events: visible; pointer-events: visible;
text-transform: capitalize; text-transform: capitalize;
} }
#mid-left label, #mid-left svg { #panel-left label, #panel-left svg {
pointer-events: none; pointer-events: none;
} }
#right-work > div {
padding: 0 5px 0 5px;
}
.slim-hide { .slim-hide {
width: 0; width: 0;
@ -671,6 +682,13 @@ th, tr, td, label {
max-height: 1px; max-height: 1px;
background-image: var(--gradbar); background-image: var(--gradbar);
} }
.line-sep2 {
z-index: 14;
height: 1px;
min-height: 1px;
max-height: 1px;
background-image: var(--gradbar2);
}
.mid-sep { .mid-sep {
z-index: 14; z-index: 14;
width: 1px; width: 1px;
@ -938,18 +956,9 @@ th, tr, td, label {
display: flex; display: flex;
padding: 5px 0 0 0; padding: 5px 0 0 0;
} }
.work-header {
background-color: var(--work-area);
font-size: smaller;
flex-direction: column;
justify-content: stretch;
text-align: center;
padding: 10px;
gap: 5px;
}
.cam-pop-op { .cam-pop-op {
top: 0; top: 0;
right: 100%; right: calc(100% + 4px);
text-align: left; text-align: left;
position: absolute; position: absolute;
white-space: nowrap; white-space: nowrap;
@ -1055,8 +1064,8 @@ th, tr, td, label {
#op-add-pop { #op-add-pop {
position: absolute; position: absolute;
display: none; display: none;
right: 100%;
top: 0; top: 0;
right: 100%;
transform: translateY(-50%); transform: translateY(-50%);
} }
#op-add:hover #op-add-pop { #op-add:hover #op-add-pop {
@ -1070,10 +1079,12 @@ th, tr, td, label {
gap: 5px; gap: 5px;
} }
#op-add-list { #op-add-list {
margin-right: 10px;
padding: 4px; padding: 4px;
display: flex; display: flex;
align-items: stretch; align-items: stretch;
flex-direction: column; flex-direction: column;
text-transform: none !important;
} }
#op-add-list > div { #op-add-list > div {
padding: 3px 5px 3px 5px; padding: 3px 5px 3px 5px;
@ -1081,6 +1092,7 @@ th, tr, td, label {
flex-direction: column; flex-direction: column;
border: 1px dashed gray; border: 1px dashed gray;
border-radius: 3px; border-radius: 3px;
text-align: center;
} }
#op-add-list > div:hover { #op-add-list > div:hover {
background-color: rgba(0,0,0,0.2); background-color: rgba(0,0,0,0.2);
@ -1840,7 +1852,10 @@ th, tr, td, label {
border-radius: 3px; border-radius: 3px;
} }
#settings { #panel-right{
overflow: unset;
}
.settings {
max-height: 100%; max-height: 100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
@ -1848,46 +1863,38 @@ th, tr, td, label {
text-transform: capitalize; text-transform: capitalize;
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,0.5);
} }
#settings .set-group { .settings .set-group {
cursor: pointer; cursor: pointer;
} }
#settings .pop-sep { .settings .pop-sep {
display: none !important; display: none !important;
} }
.settings .set-header a {
font-size: smaller;
}
.set2-group { .set2-group {
background-color: #f8f8f8;
border: 1px solid #ccc;
border-radius: 10px;
padding-bottom: 2px; padding-bottom: 2px;
margin: 3px; margin: 3px;
gap: 1.5px; gap: 1.5px;
} }
.set2-group .var-row { .set2-group .var-row {
margin: 0 7px 0 7px !important; padding: 0 7px 0 7px !important;
margin: 0 !important;
border-left: 3px solid transparent;
border-right: 3px solid transparent;
}
.set2-group .var-row:hover {
border-left: 3px solid #ddd;
border-right: 3px solid #ddd;
background-color: #f8f8f8 !important;
} }
.set2-group .var-row label { .set2-group .var-row label {
margin-right: 25px; margin-right: 25px;
} }
.set2-group .set-header { .set2-sep {
background-color: #ddd !important; flex-shrink: 0;
padding: 5px !important; flex-direction: column;
margin: 0 0 3px 0 !important; margin: 0 0 3px 0;
border-top-left-radius: 10px !important;
border-top-right-radius: 10px !important;
}
.set2-group .set-header a {
text-transform: uppercase;
text-align: center;
font-weight: bold;
font-size: smaller;
flex-grow: 1;
}
.set2-group .set-header hr {
border: 0 !important;
flex-grow: 0 !important;
max-width: 0 !important;
max-height: 0 o !important;
} }
.pop-sep, .set-sep { .pop-sep, .set-sep {
border: 0 !important; border: 0 !important;
@ -1899,26 +1906,18 @@ th, tr, td, label {
background-color: #bbb; background-color: #bbb;
} }
.set-header { .set-header {
padding: 3px 5px 3px 5px;
margin: 7px 3px 3px 3px;
white-space: nowrap; white-space: nowrap;
border-radius: 2px; border-radius: 2px;
justify-content: center; justify-content: center;
background-color: var(--menu); background-color: var(--menu);
border-left: 3px solid #ddd;
border-right: 3px solid #ddd;
padding: 4px;
margin: 0 0 4px 0;
} }
.set-header hr { .settings .set-header {
display: none;
}
#settings .set-header {
justify-content: left !important;
background-color: transparent;
border-radius: 2px; border-radius: 2px;
} margin: 0 !important;
#settings .set-header hr {
display: flex !important;
}
#settings .set-header:hover {
background-color: rgba(0,0,0,0.1) !important;
} }
.set-header-line { .set-header-line {
margin-left: 5px; margin-left: 5px;
@ -1951,13 +1950,13 @@ th, tr, td, label {
margin-right: 5px; margin-right: 5px;
padding: 5px; padding: 5px;
} }
#settings .var-row { .settings .var-row {
margin: 0 10px 0 15px; margin: 0 10px 0 15px;
} }
#settings .var-row:hover { /* .settings .var-row:hover {
color: blue; color: blue;
} } */
#settings .ext-buttons { .settings .ext-buttons {
margin: 0 9px 0 14px; margin: 0 9px 0 14px;
gap: 3px; gap: 3px;
} }

193
web/kiri/index.html
View file

@ -246,7 +246,7 @@
<div id="mid" class="grow f-row"> <div id="mid" class="grow f-row">
<!-- left settings menu --> <!-- left settings menu -->
<div id="mid-left" class="f-col j-left"> <div id="panel-left" class="f-col j-left">
<!-- ephemeral --> <!-- ephemeral -->
<div id="lt-back" class="lt-menu lt-enabled"> <div id="lt-back" class="lt-menu lt-enabled">
<i class="fas fa-arrow-circle-left"></i> <i class="fas fa-arrow-circle-left"></i>
@ -267,10 +267,10 @@
<div><label>Device</label><span id="mode-device"></span></div> <div><label>Device</label><span id="mode-device"></span></div>
<div><label>Profile</label><span id="mode-profile"></span></div> <div><label>Profile</label><span id="mode-profile"></span></div>
</div> </div>
<div class="line-sep"></div> <div class="line-sep2"></div>
<div class="chonk"></div> <!-- <div class="chonk"></div>
<div class="line-sep"></div> <div class="line-sep"></div> -->
<div id="settings" class="f-col grow"> <div class="f-col grow settings">
<!-- FDM --> <!-- FDM -->
<div id="fdm-layers" class="f-col set2-group mode-fdm"></div> <div id="fdm-layers" class="f-col set2-group mode-fdm"></div>
<div id="fdm-base" class="f-col set2-group mode-fdm"></div> <div id="fdm-base" class="f-col set2-group mode-fdm"></div>
@ -308,6 +308,106 @@
<!-- main workspace --> <!-- main workspace -->
<div id="mid-mid" class="grow"> <div id="mid-mid" class="grow">
<div id="layer-slider" class="f-col a-stretch">
<div id="layers" class="f-row j-center"></div>
<div id="slider" class="f-row russo">
<div id="slider-zero">0</div>
<div id="slider-center" class="grow">
<div id="slider-hold" class="f-row">
<div id="slider-lo" class="handle"><div id="slider-lo-val"></div></div>
<div id="slider-mid">&nbsp;</div>
<div id="slider-hi" class="handle"><div id="slider-hi-val"></div></div>
</div>
</div>
<div id="slider-max">&infin;</div>
</div>
</div>
</div>
<!-- allows right tray to slide/hide but still show speeds menu -->
<div class="f-row j-center">
<div id="set-menu" class="f-col">
<div id="speeds"><div id="speedbar" class="f-col a-stretch j-center" lkt="sb_info"></div></div>
</div>
<!-- vertical separation between workspace and right tray -->
<div class="mid-sep"></div>
<div id="panel-right" class="f-col j-start settings">
<div class="set2-group f-col">
<div class="set-header">
<a>workspace</a>
</div>
<div class="set2-set f-col">
<div class="line-sep2"></div>
<div class="chonk2"></div>
<div class="line-sep2"></div>
</div>
<div id="ws-widgets" class="f-col"></div>
</div>
<div class="set2-group f-col mode-fdm">
<div class="set-header">
<a>ranges</a>
</div>
<div class="set2-set f-col">
<div class="line-sep2"></div>
<div class="chonk2"></div>
<div class="line-sep2"></div>
</div>
<div id="fdm-ranges" class="f-col"></div>
</div>
<div class="set2-group f-col">
<div id="workspace-tool"></div>
</div>
<div class="set2-group f-col mode-cam">
<div class="set-header mode-cam">
<a>operation list</a>
</div>
<div class="set2-set f-col">
<div class="line-sep2"></div>
<div class="chonk2"></div>
<div class="line-sep2"></div>
</div>
<div id="camops" class="f-col a-stretch grow">
<div id="oplist" class="f-col j-center"></div>
<div id="op-add" class="opdiv">
<i class="fas fa-plus"></i>
<div id="op-add-pop" class="f-col">
<div id="op-add-list" class="opdiv op-grid">
<div id="cam-index" title="rotate index axis">index</div>
<div id="cam-lathe" title="lathe operation">lathe</div>
<div id="laser-on" title="turn on laser mode">laser on</div>
<div id="laser-off" title="turn off laser mode">laser off</div>
<div id="cam-flip" title="flip part and load&#13;profile for other side&#13;for double-sided work">flip</div>
<div id="cam-reg" title="drill registration holes&#13;along the X or Y axis&#13;for double-sided work">register</div>
<div title="drill any holes matching&#13;selected tool diameter">drill</div>
<div title="clear stock face&#13;or top of part&#13;when no stock">level</div>
<div title="follow selected features with&#13;a specified tool. often used&#13;for lettering and engraving">trace</div>
<div title="insert custom gcode">gcode</div>
<div title="remove an area of material&#13;inside a defined boundary&#13;sometimes called pocketing">rough</div>
<div title="clean up after roughing&#13;or perform a part cutout">outline</div>
<div title="2.5D tracing along X or Y axis&#13;used for complex part features">contour</div>
<div title="clear areas above&#13;selected surfaces">pocket</div>
</div>
</div>
</div>
</div>
</div>
<div class="grow"></div>
<div class="line-sep2"></div>
<div class="chonk"></div>
<div class="line-sep2"></div>
</div>
</div>
</div>
<!-- <div id="end" class="f-col a-center">
the end
<div id="bottom">the bottom</div>
</div> -->
<!-- ThreeJS container -->
<div id="container"></div>
<!-- modal dialogs-->
<div id="modal"> <div id="modal">
<div id="modal-box" class="f-col"> <div id="modal-box" class="f-col">
@ -468,89 +568,6 @@
<div id="mod-any" class="mdialog f-col"></div> <div id="mod-any" class="mdialog f-col"></div>
<div class="mod-end"></div></div> <div class="mod-end"></div></div>
</div> </div>
<div id="layer-slider" class="f-col a-stretch">
<div id="layers" class="f-row j-center"></div>
<div id="slider" class="f-row russo">
<div id="slider-zero">0</div>
<div id="slider-center" class="grow">
<div id="slider-hold" class="f-row">
<div id="slider-lo" class="handle"><div id="slider-lo-val"></div></div>
<div id="slider-mid">&nbsp;</div>
<div id="slider-hi" class="handle"><div id="slider-hi-val"></div></div>
</div>
</div>
<div id="slider-max">&infin;</div>
</div>
</div>
</div>
<!-- allows right tray to slide/hide but still show speeds menu -->
<div id="mid-right" class="f-row j-center">
<div id="set-menu" class="f-col">
<div id="speeds"><div id="speedbar" class="f-col a-stretch j-center" lkt="sb_info"></div></div>
</div>
<!-- vertical separation between workspace and right tray -->
<div class="mid-sep"></div>
<div id="right-work" class="f-col j-start">
<div class="set-header f-col">
<a class="work-header"><span>workspace</span></a>
<div id="ws-widgets" class="f-col"></div>
</div>
<div class="line-sep"></div>
<div class="chonk"></div>
<div class="line-sep"></div>
<div class="set-header f-col mode-fdm">
<a class="work-header"><span>ranges</span></a>
<div id="fdm-ranges" class="f-col"></div>
</div>
<div id="workspace-tool"></div>
<div class="contents mode-cam">
<div class="work-header">
<span>CNC</span>
<span>operations</span>
</div>
<div class="line-sep"></div>
<div class="chonk"></div>
<div class="line-sep"></div>
<div id="camops" class="f-col a-stretch grow">
<div id="oplist" class="f-col j-center"></div>
<div id="op-add" class="opdiv">
<i class="fas fa-plus"></i>
<div id="op-add-pop" class="f-col">
<div id="op-add-list" class="opdiv op-grid">
<div id="cam-index" title="rotate index axis">index</div>
<div id="cam-lathe" title="lathe operation">lathe</div>
<div id="laser-on" title="turn on laser mode">laser on</div>
<div id="laser-off" title="turn off laser mode">laser off</div>
<div id="cam-flip" title="flip part and load&#13;profile for other side&#13;for double-sided work">flip</div>
<div id="cam-reg" title="drill registration holes&#13;along the X or Y axis&#13;for double-sided work">register</div>
<div title="drill any holes matching&#13;selected tool diameter">drill</div>
<div title="clear stock face&#13;or top of part&#13;when no stock">level</div>
<div title="follow selected features with&#13;a specified tool. often used&#13;for lettering and engraving">trace</div>
<div title="insert custom gcode">gcode</div>
<div title="remove an area of material&#13;inside a defined boundary&#13;sometimes called pocketing">rough</div>
<div title="clean up after roughing&#13;or perform a part cutout">outline</div>
<div title="2.5D tracing along X or Y axis&#13;used for complex part features">contour</div>
<div title="clear areas above&#13;selected surfaces">pocket</div>
</div>
</div>
</div>
</div>
</div>
<div class="line-sep"></div>
<div class="chonk"></div>
<div class="line-sep"></div>
</div>
</div>
</div>
<!-- <div id="end" class="f-col a-center">
the end
<div id="bottom">the bottom</div>
</div> -->
<!-- ThreeJS container -->
<div id="container"></div>
<!-- click + drag mouse tracking --> <!-- click + drag mouse tracking -->
<div id="tracker"></div> <div id="tracker"></div>