fix curves only in contouring. update rough voids help

This commit is contained in:
Stewart Allen 2020-06-29 10:33:13 -04:00
commit e610175782
3 changed files with 6 additions and 6 deletions

View file

@ -403,7 +403,7 @@
camRoughSpeed: 1000, // roughingSpeed camRoughSpeed: 1000, // roughingSpeed
camRoughPlunge: 250, // roughingPlunge camRoughPlunge: 250, // roughingPlunge
camRoughStock: 0, // roughingStock camRoughStock: 0, // roughingStock
camRoughVoid: true, // roughingPocket camRoughVoid: false, // roughingPocket
camRoughOn: true, // roughingOn camRoughOn: true, // roughingOn
camOutlineTool: 1000, // finishingTool camOutlineTool: 1000, // finishingTool
camOutlineSpindle: 1000,// finishingSpindle camOutlineSpindle: 1000,// finishingSpindle

View file

@ -400,8 +400,8 @@
maxY = bounds.max.y,// + diameter, maxY = bounds.max.y,// + diameter,
boundsX = maxX - minX, boundsX = maxX - minX,
boundsY = maxY - minY, boundsY = maxY - minY,
maxangle = proc.finishingAngle, maxangle = proc.camContourAngle,
curvesOnly = proc.finishCurvesOnly, curvesOnly = proc.camContourCurves,
R2A = 180 / Math.PI, R2A = 180 / Math.PI,
stepsx = Math.ceil(boundsX / resolution), stepsx = Math.ceil(boundsX / resolution),
stepsy = Math.ceil(boundsY / resolution), stepsy = Math.ceil(boundsY / resolution),
@ -1628,7 +1628,7 @@
}, depthData.finishDiam * 0.01); }, depthData.finishDiam * 0.01);
} }
// two modes for deferred finishing: x then y or combined // two modes for deferred finishing: x then y or combined
if (process.finishCurvesOnly) { if (process.camContourCurves) {
setTool(process.camOutlineTool, process.camOutlineSpeed, process.camOutlinePlunge); setTool(process.camOutlineTool, process.camOutlineSpeed, process.camOutlinePlunge);
spindle = Math.min(spindleMax, process.camOutlineSpindle); spindle = Math.min(spindleMax, process.camOutlineSpindle);
// combined deferred linear x and y finishing // combined deferred linear x and y finishing

View file

@ -255,8 +255,8 @@ kiri.lang['en-us'] = {
cr_lsto_l: "horizontal offset from vertical faces\nstock to leave for finishing pass\nin workspace units", cr_lsto_l: "horizontal offset from vertical faces\nstock to leave for finishing pass\nin workspace units",
cr_ease_s: "ease down", cr_ease_s: "ease down",
cr_ease_l: "plunge cuts will\nspiral down or ease\nalong a linear path", cr_ease_l: "plunge cuts will\nspiral down or ease\nalong a linear path",
cr_clrp_s: "pocket clear", cr_clrp_s: "clear voids",
cr_clrp_l: "mill out entire pocket instead\nof just cutting the outline", cr_clrp_l: "mill out through pockets\ninstead of just the outline",
// CNC OUTLINE // CNC OUTLINE
co_menu: "outline", co_menu: "outline",