Merge branch 'rel-4.1' of https://github.com/GridSpace/grid-apps into drill-improvments

prettier.config.js

@@ -0,0 +1,19 @@
+
+/**
+ * @see https://prettier.io/docs/configuration
+ * @type {import("prettier").Config}
+ */
+const config = {
+  trailingComma: "es5",
+  useTabs: false,
+  bracketSpacing: true,
+  objectWrap: "preserve",
+  tabWidth: 4,
+  semi: false,
+  singleQuote: true,
+  bracketSameLine: true,
+  arrowParens: "always",
+  endOfLine: "crlf"
+}
+
+module.exports = config

src/kiri-mode/cam/ops.js

@@ -1503,22 +1503,19 @@ class OpDrill extends CamOp {
             if(!drill.selected){
                 return
             }
-            let slice = newSlice(0);            
+            let slice = newSlice(0);
             if (op.mark) {
                 // replace depth with single down peck
                 drill.depth = op.down
             }
             drill.zBottom = drill.z - drill.depth;
-            
             // for thru holes, follow z thru when set
             if ((op.thru>0) ) {
                 drill.zBottom -= op.thru;
             }
-            
             const poly  = newPolygon()
             poly.points.push(newPoint(drill.x, drill.y, drill.z))
             poly.points.push(newPoint(drill.x, drill.y, drill.zBottom))
-                
             // poly.points.pop();
             slice.camTrace = { tool: op.tool, rate: op.feed, plunge: op.rate };
             slice.camLines = [poly];

src/kiri-mode/cam/slice.js

@@ -504,6 +504,7 @@ CAM.holes = async function(settings, widget, individual, rec) {
                 continue;
             }
             for (let poly of inner) {
+                if ( poly.points.length < 7 ) continue;
                 let center = poly.calcCircleCenter();
                 center.area = poly.area();
                 center.overlapping = [center]