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

replace + with select button and remove check button on trace and pocket

Browse source
This commit is contained in:
Stewart Allen 2025-02-08 12:58:09 -05:00
commit 700086904b
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -611,6 +611,10 @@ CAM.init = function(kiri, api) {
}, 250); }, 250);
} }
function onDown(ev) { function onDown(ev) {
if (!ev.target.rec) {
// only trigger on operation buttons bound to recs
return;
}
let mobile = ev.touches; let mobile = ev.touches;
func.surfaceDone(); func.surfaceDone();
func.traceDone(); func.traceDone();
@ -931,6 +935,9 @@ CAM.init = function(kiri, api) {
// SURFACE FUNCS // SURFACE FUNCS
let surfaceOn = false, lastWidget; let surfaceOn = false, lastWidget;
func.surfaceAdd = (ev) => { func.surfaceAdd = (ev) => {
if (surfaceOn) {
return func.surfaceDone();
}
func.clearPops(); func.clearPops();
alert = api.show.alert("analyzing surfaces...", 1000); alert = api.show.alert("analyzing surfaces...", 1000);
let surfaces = poppedRec.surfaces; let surfaces = poppedRec.surfaces;
@ -982,6 +989,9 @@ CAM.init = function(kiri, api) {
// TRACE FUNCS // TRACE FUNCS
let traceOn = false, lastTrace; let traceOn = false, lastTrace;
func.traceAdd = (ev) => { func.traceAdd = (ev) => {
if (traceOn) {
return func.traceDone();
}
func.clearPops(); func.clearPops();
alert = api.show.alert("analyzing parts...", 1000); alert = api.show.alert("analyzing parts...", 1000);
traceOn = hoveredOp; traceOn = hoveredOp;
@ -1492,10 +1502,7 @@ CAM.init = function(kiri, api) {
dogbone: UC.newBoolean(LANG.co_dogb_s, undefined, {title:LANG.co_dogb_l, show:canDogBones}), dogbone: UC.newBoolean(LANG.co_dogb_s, undefined, {title:LANG.co_dogb_l, show:canDogBones}),
revbone: UC.newBoolean(LANG.co_dogr_s, undefined, {title:LANG.co_dogr_l, show:canDogBonesRev}), revbone: UC.newBoolean(LANG.co_dogr_s, undefined, {title:LANG.co_dogr_l, show:canDogBonesRev}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
menu: UC.newRow([ menu: UC.newRow([ UC.newButton("select", func.traceAdd) ], {class:"ext-buttons f-row"}),
UC.newButton(undefined, func.traceAdd, {icon:'<i class="fas fa-plus"></i>'}),
UC.newButton(undefined, func.traceDone, {icon:'<i class="fas fa-check"></i>'}),
], {class:"ext-buttons f-row"}),
}; };
createPopOp('pocket', { createPopOp('pocket', {
@ -1533,10 +1540,7 @@ CAM.init = function(kiri, api) {
outline: UC.newBoolean(LANG.cp_outl_s, undefined, {title:LANG.cp_outl_l, show:() => !poppedRec.contour}), outline: UC.newBoolean(LANG.cp_outl_s, undefined, {title:LANG.cp_outl_l, show:() => !poppedRec.contour}),
engrave: UC.newBoolean(LANG.cp_engr_s, undefined, {title:LANG.cp_engr_l, show:() => poppedRec.contour}), engrave: UC.newBoolean(LANG.cp_engr_s, undefined, {title:LANG.cp_engr_l, show:() => poppedRec.contour}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
menu: UC.newRow([ menu: UC.newRow([ UC.newButton("select", func.surfaceAdd) ], {class:"ext-buttons f-row"}),
UC.newButton(undefined, func.surfaceAdd, {icon:'<i class="fas fa-plus"></i>'}),
UC.newButton(undefined, func.surfaceDone, {icon:'<i class="fas fa-check"></i>'}),
], {class:"ext-buttons f-row"}),
}; };
createPopOp('drill', { createPopOp('drill', {
@ -1591,9 +1595,7 @@ CAM.init = function(kiri, api) {
sep: UC.newBlank({class:"pop-sep", modes:MCAM, show:zBottom}), sep: UC.newBlank({class:"pop-sep", modes:MCAM, show:zBottom}),
invert: UC.newBoolean(LANG.cf_nvrt_s, undefined, {title:LANG.cf_nvrt_l, show:zBottom}), invert: UC.newBoolean(LANG.cf_nvrt_s, undefined, {title:LANG.cf_nvrt_l, show:zBottom}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
action: UC.newRow([ action: UC.newRow([ UC.newButton(LANG.cf_menu, func.opFlip) ], {class:"ext-buttons f-row"})
UC.newButton(LANG.cf_menu, func.opFlip)
], {class:"ext-buttons f-row"})
}; };
createPopOp('gcode', { createPopOp('gcode', {

1
src/kiri-mode/cam/driver.js
View file

@ -69,7 +69,6 @@ kiri.load(api => {
kiri.client.send("cam_traces", { settings, single }, output => { kiri.client.send("cam_traces", { settings, single }, output => {
const ids = []; const ids = [];
kiri.codec.decode(output).forEach(rec => { kiri.codec.decode(output).forEach(rec => {
console.log({ rec });
ids.push(rec.id); ids.push(rec.id);
widgets[rec.id].traces = rec.traces; widgets[rec.id].traces = rec.traces;
}); });