diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index e5667f43..b60fcce8 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -1371,7 +1371,7 @@ CAM.init = function(kiri, api) { axis: 'X' }).inputs = { tool: UC.newSelect(LANG.cc_tool, {}, "tools"), - axis: UC.newSelect(LANG.cd_axis, {}, "xyaxis"), + // axis: UC.newSelect(LANG.cd_axis, {}, "xyaxis"), sep: UC.newBlank({class:"pop-sep"}), spindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, show:hasSpindle}), rate: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true}), diff --git a/src/kiri-mode/cam/topo4.js b/src/kiri-mode/cam/topo4.js index 9053b532..7941b00c 100644 --- a/src/kiri-mode/cam/topo4.js +++ b/src/kiri-mode/cam/topo4.js @@ -339,7 +339,7 @@ class Topo4 { const { degrees, heights } = rec; [...heights].group(3).forEach((a,i) => { // progress each path 360 degrees to prevent A rolling backwards - paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(degrees+ i * -360) ); + paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(-degrees + i * -360) ); }); } @@ -415,7 +415,7 @@ class Topo4 { const { degrees, heights } = rec; [...heights].group(3).forEach((a,i) => { // progress each path 360 degrees to prevent A rolling backwards - paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(degrees+ i * -360) ); + paths[i].camLines[0].push( newPoint(a[0], a[1], a[2] + leave).setA(-degrees + i * -360) ); }); }