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 import of taper tool dependencies

Browse source
This commit is contained in:
Stewart Allen 2025-09-08 17:40:33 -04:00
commit b1c73b5e46
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kiri/mode/cam/tools.js
View file

@ -4,6 +4,7 @@ import { $ } from '../../../moto/webui.js';
import { api } from '../../core/api.js'; import { api } from '../../core/api.js';
import { consts } from '../../core/consts.js'; import { consts } from '../../core/consts.js';
import { settings as setconf } from '../../core/settings.js'; import { settings as setconf } from '../../core/settings.js';
import { calcTaperLength, calcTaperAngle } from './tool.js';
const DEG2RAD = Math.PI / 180; const DEG2RAD = Math.PI / 180;
@ -44,7 +45,7 @@ function selectTool(tool) {
ui.toolMetric.checked = tool.metric; ui.toolMetric.checked = tool.metric;
ui.toolType.selectedIndex = toolNames.indexOf(tool.type); ui.toolType.selectedIndex = toolNames.indexOf(tool.type);
if (tool === 'tapermill') { if (tool === 'tapermill') {
ui.toolTaperAngle.value = kiri.driver.CAM.calcTaperAngle( ui.toolTaperAngle.value = calcTaperAngle(
(tool.flute_diam - tool.taper_tip) / 2, tool.flute_len (tool.flute_diam - tool.taper_tip) / 2, tool.flute_len
).round(1); ).round(1);
} else if(tool === 'drill'){ } else if(tool === 'drill'){
@ -208,16 +209,15 @@ export function updateTool(ev) {
selectedTool.metric = ui.toolMetric.checked; selectedTool.metric = ui.toolMetric.checked;
selectedTool.type = toolNames[ui.toolType.selectedIndex]; selectedTool.type = toolNames[ui.toolType.selectedIndex];
if (selectedTool.type === 'tapermill') { if (selectedTool.type === 'tapermill') {
const CAM = kiri.driver.CAM;
const rad = (selectedTool.flute_diam - selectedTool.taper_tip) / 2; const rad = (selectedTool.flute_diam - selectedTool.taper_tip) / 2;
if (ev && ev.target === ui.toolTaperAngle) { if (ev && ev.target === ui.toolTaperAngle) {
const angle = parseFloat(ev.target.value); const angle = parseFloat(ev.target.value);
const len = CAM.calcTaperLength(rad, angle * DEG2RAD); const len = calcTaperLength(rad, angle * DEG2RAD);
selectedTool.flute_len = len; selectedTool.flute_len = len;
ui.toolTaperAngle.value = angle.round(1); ui.toolTaperAngle.value = angle.round(1);
ui.toolFluteLen.value = selectedTool.flute_len.round(4); ui.toolFluteLen.value = selectedTool.flute_len.round(4);
} else { } else {
ui.toolTaperAngle.value = CAM.calcTaperAngle(rad, selectedTool.flute_len).round(1); ui.toolTaperAngle.value = calcTaperAngle(rad, selectedTool.flute_len).round(1);
} }
} else { } else {
ui.toolTaperAngle.value = 0; ui.toolTaperAngle.value = 0;