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

revert pass thru topo4 z bottom. move taper angle rounding to ui code

Browse source
This commit is contained in:
Stewart Allen 2023-02-19 08:35:10 -05:00
commit c391bae399
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,11 +166,11 @@ class Tool {
CAM.Tool = Tool; CAM.Tool = Tool;
CAM.calcTaperAngle = function(rad, len) { CAM.calcTaperAngle = function(rad, len) {
return (Math.atan(rad / len) * RAD2DEG).round(1); return (Math.atan(rad / len) * RAD2DEG);
}; };
CAM.calcTaperLength = function(rad, angle) { CAM.calcTaperLength = function(rad, angle) {
return rad / Math.tan(angle); return (rad / Math.tan(angle));
}; };
CAM.getToolDiameter = function(settings, id) { CAM.getToolDiameter = function(settings, id) {

2
src/kiri-mode/cam/topo4.js
View file

@ -289,7 +289,7 @@ class Topo4 {
} }
} }
if (mz === -Infinity) { if (mz === -Infinity) {
mz = Math.max(lz, 0); mz = zBottom; // Math.min(0, lz)
} else if (zBottom && mz < zBottom) { } else if (zBottom && mz < zBottom) {
mz = zBottom; mz = zBottom;
} }

6
src/kiri/init.js
View file

@ -1156,7 +1156,7 @@ gapp.register("kiri.init", [], (root, exports) => {
if (tool.type === 'tapermill') { if (tool.type === 'tapermill') {
ui.toolTaperAngle.value = kiri.driver.CAM.calcTaperAngle( ui.toolTaperAngle.value = kiri.driver.CAM.calcTaperAngle(
(tool.flute_diam - tool.taper_tip) / 2, tool.flute_len (tool.flute_diam - tool.taper_tip) / 2, tool.flute_len
); ).round(1);
} else { } else {
ui.toolTaperAngle.value = 0; ui.toolTaperAngle.value = 0;
} }
@ -1278,10 +1278,10 @@ gapp.register("kiri.init", [], (root, exports) => {
const angle = parseFloat(ev.target.value); const angle = parseFloat(ev.target.value);
const len = CAM.calcTaperLength(rad, angle * DEG2RAD); const len = CAM.calcTaperLength(rad, angle * DEG2RAD);
selectedTool.flute_len = len; selectedTool.flute_len = len;
ui.toolTaperAngle.value = angle; 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); ui.toolTaperAngle.value = CAM.calcTaperAngle(rad, selectedTool.flute_len).round(1);
} }
} else { } else {
ui.toolTaperAngle.value = 0; ui.toolTaperAngle.value = 0;