QOL Updates

Bechtel-Innovation-Design-Center · Jul 22, 2021 · 0a85e58 · 0a85e58
1 parent 63b7791
commit 0a85e58
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+Haas_Next_Generation/Bechtel VF2HP.cps
diff --git a/Haas_Gantry_BIDC/Bechtel SR.cps b/Haas_Gantry_BIDC/Bechtel SR.cps
@@ -850,21 +850,26 @@ function onOpen() {
     var tools = getToolTable();
     if (tools.getNumberOfTools() > 0) {
       for (var i = 0; i < tools.getNumberOfTools(); ++i) {
-        // if (tool.number == 1 || tool.number == 2) {
-        //   throw "Tool numbers 1 and 2 are not available."
-        // }
         var tool = tools.getTool(i);
-        var comment = "T" + toolFormat.format(tool.number) + " " +
-          "D=" + xyzFormat.format(tool.diameter) + " " +
-          localize("CR") + "=" + xyzFormat.format(tool.cornerRadius);
-        if ((tool.taperAngle > 0) && (tool.taperAngle < Math.PI)) {
-          comment += " " + localize("TAPER") + "=" + taperFormat.format(tool.taperAngle) + localize("deg");
+        if (tool.number == 1 || tool.number == 2) {
+          throw "Tool numbers 1 and 2 are not available for use."
         }
-        if (zRanges[tool.number]) {
-          comment += " - " + localize("ZMIN") + "=" + xyzFormat.format(zRanges[tool.number].getMinimum());
+        if (getHaasToolTypeBIDC(tool.type) == HAAS_PROBE) {
+          continue;
         }
-        comment += " - " + getToolTypeName(tool.type);
-        //writeComment(comment);
+        writeComment("T" + toolFormat.format(tool.number) + ": " + tool.description);
+        // 
+        // var comment = "T" + toolFormat.format(tool.number) + " " +
+        //   "D=" + xyzFormat.format(tool.diameter) + " " +
+        //   localize("CR") + "=" + xyzFormat.format(tool.cornerRadius);
+        // if ((tool.taperAngle > 0) && (tool.taperAngle < Math.PI)) {
+        //   comment += " " + localize("TAPER") + "=" + taperFormat.format(tool.taperAngle) + localize("deg");
+        // }
+        // if (zRanges[tool.number]) {
+        //   comment += " - " + localize("ZMIN") + "=" + xyzFormat.format(zRanges[tool.number].getMinimum());
+        // }
+        // comment += " - " + getToolTypeName(tool.type);
+        // writeComment(comment);
       }
     }
   }
@@ -898,7 +903,7 @@ function onOpen() {
         }
         comment += " - " + getToolTypeName(tool.type);
         writeComment(tool.description);
-        writeComment(comment);
+        //writeComment(comment);
         if (staticProperties.optionallyMeasureToolsAtStart) {
           var probeType = getHaasProbingTypeBIDC(tool, false)
           if (!retracted) {