CNC No Offset Vector Cut

OpenBuilds · Sep 17, 2018 · f6c4ae1 · f6c4ae1
1 parent d8db051
commit f6c4ae1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/js/advanced-cam-modal.js b/js/advanced-cam-modal.js
@@ -14,6 +14,9 @@ function typeofOperation(newval, objectseq) {
   } else if (newval == "Laser: Vector (raster fill) (Beta)") {
     laserOutsideMode(objectseq);
     updateCamUserData(objectseq);
+  } else if (newval == "CNC: Vector (no offset)") {
+    cncNoOffsetMode(objectseq);
+    updateCamUserData(objectseq);
   } else if (newval == "CNC: Vector (path outside)") {
     cncOutsideMode(objectseq);
     updateCamUserData(objectseq);
@@ -215,6 +218,7 @@ function setupJob(i) {
             <span class="input-addon-label-left active-border"><i class="fa fa-wrench fa-fw" aria-hidden="true"></i></span>
             <select class="cam-form-field cam-form-field-right active-border" id="toperation` + i + `" objectseq="` + i + `" style="width: 180px; padding: 0px;">
               <option>... Select Operation ...</option>
+              <option>CNC: Vector (no offset)</option>
               <option>CNC: Vector (path inside)</option>
               <option>CNC: Vector (path outside)</option>
               <option>CNC: Pocket</option>
@@ -233,7 +237,7 @@ function setupJob(i) {
         </td>
 
       </tr>
-      <tr class="inputcnc inputpocket">
+      <tr class="inputcnc inputpocket inputtooldia">
         <td>Endmill Diameter</td>
         <td>
           <div class="input-addon">
@@ -561,6 +565,15 @@ function cncOutsideMode(i) {
   $('.inputcnc').show();
 };
 
+function cncNoOffsetMode(i) {
+  $('.inputlaser').hide();
+  $('.inputpocket').hide();
+  $('.inputdragknife').hide();
+  $('.inputplasma').hide();
+  $('.inputcnc').show();
+  $('.inputtooldia').hide();
+}
+
 function cncPocketMode(i) {
   $('.inputlaser').hide();
   $('.inputdragknife').hide();

diff --git a/js/advanced-cam-preview.js b/js/advanced-cam-preview.js
@@ -58,6 +58,8 @@ function toolpathPreviewExec(i) {
     toolpathsInScene[i].userData.inflated = getToolpath("inflate", i, (SpotSize / 2), 0, 1, 1, 0, false, false, false, false, union);
   } else if (operation == "Laser: Vector (raster fill) (Beta)") {
     toolpathsInScene[i].userData.inflated = getToolpath("fill", i, (SpotSize / 2), 0, 1, 1, 0, false, false, false, false, union);
+  } else if (operation == "CNC: Vector (no offset)") {
+    toolpathsInScene[i].userData.inflated = getToolpath("inflate", i, 0, 0, ZStep, ZDepth, ZStart, false, tabdepth, tabspace, tabwidth, union);
   } else if (operation == "CNC: Vector (path inside)") {
     toolpathsInScene[i].userData.inflated = getToolpath("inflate", i, -(ToolDia / 2), 0, ZStep, ZDepth, ZStart, false, tabdepth, tabspace, tabwidth, union);
   } else if (operation == "CNC: Vector (path outside)") {