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

update for 4.3

Browse source
This commit is contained in:
bakedpotatolord 2025-07-21 09:45:26 -06:00
commit 08eb3c96c3
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/kiri/mode/cam/cl-ops.js
View file

@ -101,12 +101,12 @@ export function createPopOp(type, map) {
const settings = conf.get(); const settings = conf.get();
const { tool } = new Tool(settings, op.rec.tool); //get tool by id const { tool } = new Tool(settings, op.rec.tool); //get tool by id
const opType = op.rec.type const opType = op.rec.type
const drillOrRegister = opType == "drill" || opType == "register" const drillingOp = opType == "drill" || ( opType == "register" && op.rec.axis != "-" )
if (!drillOrRegister && tool.type == "drill") { if (!drillingOp && tool.type == "drill") {
alerts.show(`Warning: Drills should not be used for ${opType} operations.`) alerts.show(`Warning: Drills should not be used for non-drilling operations.`)
} }
else if (drillOrRegister && tool.type != "drill") { else if (drillingOp && tool.type != "drill") {
alerts.show(`Warning: Only drills should be used for drilling operations.`) alerts.show(`Warning: Only drills should be used for drilling operations.`)
} }
@ -513,15 +513,15 @@ export function createPopOps() {
}).inputs = { }).inputs = {
tool: UC.newSelect(LANG.cc_tool, {}, "tools"), tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
axis: UC.newSelect(LANG.cd_axis, {}, "regaxis"), axis: UC.newSelect(LANG.cd_axis, {}, "regaxis"),
points: UC.newSelect(LANG.cd_points, {show:() => poppedRec.axis !== '-'}, "regpoints"), points: UC.newSelect(LANG.cd_points, {show:() => env.poppedRec.axis !== '-'}, "regpoints"),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
spindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, show:hasSpindle}), spindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, show:hasSpindle}),
rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}), rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}),
feed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true, show:() => poppedRec.axis === '-'}), feed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true, show:() => env.poppedRec.axis === '-'}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}), down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}),
dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat, show:() => poppedRec.axis !== '-'}), dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat, show:() => env.poppedRec.axis !== '-'}),
lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => poppedRec.axis !== '-'}), lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => env.poppedRec.axis !== '-'}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
offset: UC.newInput(LANG.cd_rego_s, {title:LANG.cd_rego_l, convert:UC.toFloat, units:true, }), offset: UC.newInput(LANG.cd_rego_s, {title:LANG.cd_rego_l, convert:UC.toFloat, units:true, }),
thru: UC.newInput(LANG.cd_thru_s, {title:LANG.cd_thru_l, convert:UC.toFloat, units:true}), thru: UC.newInput(LANG.cd_thru_s, {title:LANG.cd_thru_l, convert:UC.toFloat, units:true}),

2
src/kiri/mode/cam/op-register.js
View file

@ -17,7 +17,7 @@ class OpRegister extends CamOp {
let { settings, widget, bounds, addSlices, zMax, zThru, color } = state; let { settings, widget, bounds, addSlices, zMax, zThru, color } = state;
let { updateToolDiams } = state; let { updateToolDiams } = state;
let tool = new CAM.Tool(settings, op.tool); let tool = new Tool(settings, op.tool);
let sliceOut = this.sliceOut = []; let sliceOut = this.sliceOut = [];
updateToolDiams(tool.fluteDiameter()); updateToolDiams(tool.fluteDiameter());