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 as tool type

Browse source
This commit is contained in:
bakedpotatolord 2025-04-17 10:18:13 -06:00
commit 15aad5a7df
3 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/kiri-mode/cam/tool.js
View file

@ -67,11 +67,11 @@ class Tool {
}
traceOffset() {
return (this.isTaperMill() ? this.tipDiameter() : this.fluteDiameter()) / 2;
return (this.hasTaper() ? this.tipDiameter() : this.fluteDiameter()) / 2;
}
contourOffset(step) {
const diam = Math.min(this.isTaperMill() ? this.tipDiameter() : this.fluteDiameter());
const diam = Math.min(this.hasTaper() ? this.tipDiameter() : this.fluteDiameter());
return diam ? diam * step : step;
}
@ -100,10 +100,18 @@ class Tool {
return this.tool.type === "tapermill";
}
isDrill(){
return this.tool.type === "drill";
}
hasTaper() {
return this.isTaperMill() || this.isDrill();
}
generateProfile(resolution) {
// generate tool profile
let ball = this.isBallMill(),
taper = this.isTaperMill(),
taper = this.isTaperMill() || this.isDrill(),
tip_diameter = this.tipDiameter(),
shaft_offset = this.fluteLength(),
flute_diameter = this.fluteDiameter(),

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

@ -15,7 +15,8 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
DOC = document,
selectedTool = null,
editTools = null,
maxTool = 0;
maxTool = 0,
toolNames = ['endmill','ballmill','tapermill','drill'];
api.show.tools = showTools;
@ -41,6 +42,15 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
});
}
/**
* Check if a tool is a tapermill or drill (i.e. has a taper angle)
* @param {String} tool - a string representing the tool type
* @return {boolean} true if the tool has a taper angle, false if not
*/
function hasTaper(tool) {
return tool === 'tapermill' || tool === 'drill';
}
function selectTool(tool) {
selectedTool = tool;
ui.toolName.value = tool.name;
@ -51,8 +61,8 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
ui.toolShaftLen.value = tool.shaft_len;
ui.toolTaperTip.value = tool.taper_tip || 0;
ui.toolMetric.checked = tool.metric;
ui.toolType.selectedIndex = ['endmill','ballmill','tapermill'].indexOf(tool.type);
if (tool.type === 'tapermill') {
ui.toolType.selectedIndex = toolNames.indexOf(tool.type);
if (hasTaper(tool)) {
ui.toolTaperAngle.value = kiri.driver.CAM.calcTaperAngle(
(tool.flute_diam - tool.taper_tip) / 2, tool.flute_len
).round(1);
@ -83,7 +93,7 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
function renderTool(tool) {
let type = selectedTool.type;
let taper = type === 'tapermill';
let taper = hasTaper(type)
ui.toolTaperAngle.disabled = taper ? undefined : 'true';
ui.toolTaperTip.disabled = taper ? undefined : 'true';
$('tool-view').innerHTML = '<svg id="tool-svg" width="100%" height="100%"></svg>';
@ -123,7 +133,7 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
stroke
} }
];
if (type === "tapermill") {
if (taper) {
let yoff = off.y + shaft_len;
// let mid = dim.w / 2;
parts.push({path: {stroke_width, stroke, fill:flute_fill, d:[
@ -183,8 +193,8 @@ gapp.register("kiri-mode.cam.tools", (root, exports) => {
selectedTool.shaft_len = parseFloat(ui.toolShaftLen.value);
selectedTool.taper_tip = parseFloat(ui.toolTaperTip.value);
selectedTool.metric = ui.toolMetric.checked;
selectedTool.type = ['endmill','ballmill','tapermill'][ui.toolType.selectedIndex];
if (selectedTool.type === 'tapermill') {
selectedTool.type = toolNames[ui.toolType.selectedIndex];
if (hasTaper(selectedTool.type)) {
const CAM = kiri.driver.CAM;
const rad = (selectedTool.flute_diam - selectedTool.taper_tip) / 2;
if (ev && ev.target === ui.toolTaperAngle) {

1
web/kiri/index.html
View file

@ -557,6 +557,7 @@
<option value="endmill" lk="td_tyem" selected>end</option>
<option value="ballmill" lk="td_tybm">ball</option>
<option value="tapermill" lk="td_tytm">taper</option>
<option value="drill" lk="td_tydr">drill</option>
</select>
</div>
<div class="f-row var-row" title="tool number to use&#010;in gcode commands"><label lk="td_tonm">tool #</label><input id="tool-num" size="7"></input></div>