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

add drill marking

Browse source
This commit is contained in:
Stewart Allen 2022-01-31 10:37:01 -05:00
commit f1ea39f786
4 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -976,7 +976,8 @@
down: 'camDrillDown', down: 'camDrillDown',
rate: 'camDrillDownSpeed', rate: 'camDrillDownSpeed',
dwell: 'camDrillDwell', dwell: 'camDrillDwell',
lift: 'camDrillLift' lift: 'camDrillLift',
mark: 'camDrillMark'
}).inputs = { }).inputs = {
tool: UC.newSelect(LANG.cc_tool, {}, "tools"), tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
@ -984,7 +985,8 @@
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}),
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}),
dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat}), dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat}),
lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true}) lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true, show:() => !poppedRec.mark}),
mark: UC.newBoolean(LANG.cd_mark_s, undefined, {title:LANG.cd_mark_l}),
}; };
createPopOp('register', { createPopOp('register', {

11
src/kiri-mode/cam/ops.js
View file

@ -924,7 +924,7 @@
drillToolDiam = drillTool.fluteDiameter(), drillToolDiam = drillTool.fluteDiameter(),
centerDiff = drillToolDiam * 0.1, centerDiff = drillToolDiam * 0.1,
area = (drillToolDiam/2) * (drillToolDiam/2) * Math.PI, area = (drillToolDiam/2) * (drillToolDiam/2) * Math.PI,
areaDelta = area * 0.05, areaDelta = op.mark ? Infinity : area * 0.05,
sliceOut = this.sliceOut = []; sliceOut = this.sliceOut = [];
updateToolDiams(drillToolDiam); updateToolDiams(drillToolDiam);
@ -961,6 +961,15 @@
drills.forEach(function(drill) { drills.forEach(function(drill) {
let center = drill.center(true), let center = drill.center(true),
slice = newSlice(0,null); slice = newSlice(0,null);
if (op.mark) {
// replace points with single mark
let points = drill.points;
points = [
points[0],
points[0].clone().sub({x:0, y:0, z:op.down})
];
drill.points = points;
}
drill.points.forEach(function(point) { drill.points.forEach(function(point) {
point.x = center.x; point.x = center.x;
point.y = center.y; point.y = center.y;

1
src/kiri/conf.js
View file

@ -506,6 +506,7 @@
camDrillDown: 5, camDrillDown: 5,
camDrillDwell: 250, camDrillDwell: 250,
camDrillLift: 2, camDrillLift: 2,
camDrillMark: false,
camDrillingOn: false, camDrillingOn: false,
camRegisterSpeed: 1000, camRegisterSpeed: 1000,
camFlipAxis: "X", camFlipAxis: "X",

6
web/kiri/lang/en.js
View file

@ -496,14 +496,16 @@ kiri.lang['en-us'] = {
cd_menu: "drill", cd_menu: "drill",
cd_axis: "axis", cd_axis: "axis",
cd_points: "points", cd_points: "points",
cd_plpr_s: "plunge per", // cd_plpr_s: "plunge per",
cd_plpr_l: ["max plunge between","dwell periods","in workspace units","0 to disable"], // cd_plpr_l: ["max plunge between","dwell periods","in workspace units","0 to disable"],
cd_dwll_s: "dwell time", cd_dwll_s: "dwell time",
cd_dwll_l: ["dwell time","between plunges in","in milliseconds"], cd_dwll_l: ["dwell time","between plunges in","in milliseconds"],
cd_lift_s: "drill lift", cd_lift_s: "drill lift",
cd_lift_l: ["lift between plunges","after dwell period","in workspace units","0 to disable"], cd_lift_l: ["lift between plunges","after dwell period","in workspace units","0 to disable"],
cd_regi_s: "register", cd_regi_s: "register",
cd_regi_l: ["drill registration holes","for double-sided parts","independent of enable","drilling but uses same","tool and settings"], cd_regi_l: ["drill registration holes","for double-sided parts","independent of enable","drilling but uses same","tool and settings"],
cd_mark_s: "marking",
cd_mark_l: ["only mark holes, do not drill out","the step down setting is used","to determine how deep to mark"],
// CNC CUTOUT TABS // CNC CUTOUT TABS
ct_menu: "tabs", ct_menu: "tabs",