support pill hole & square pad pcb_plated_hole (#352)

Author: ShiboSoftwareDev

src/examples/plated_hole_rotated_pill_hole_with_rect_pad.fixture.tsx

@@ -0,0 +1,50 @@
+import { PCBViewer } from "../PCBViewer"
+
+export const PlatedHoleRotatedPillWithRectPad: React.FC = () => {
+  return (
+    <div style={{ backgroundColor: "black" }}>
+      <PCBViewer
+        circuitJson={
+          [
+            {
+              x: 0,
+              y: 0,
+              type: "pcb_plated_hole",
+              shape: "rotated_pill_hole_with_rect_pad",
+              layers: ["top", "bottom"],
+              port_hints: ["1"],
+              pcb_port_id: "pcb_port_1001",
+              hole_height: 2,
+              hole_width: 4,
+              hole_ccw_rotation: 45,
+              rect_pad_width: 5,
+              rect_pad_height: 3,
+              rect_ccw_rotation: 45,
+              pcb_component_id: "pcb_component_1001",
+              pcb_plated_hole_id: "pcb_plated_hole_1001",
+            },
+            {
+              x: 6,
+              y: 0,
+              type: "pcb_plated_hole",
+              shape: "rotated_pill_hole_with_rect_pad",
+              layers: ["top", "bottom"],
+              port_hints: ["1"],
+              pcb_port_id: "pcb_port_1002",
+              hole_height: 2,
+              hole_width: 4,
+              hole_ccw_rotation: 0,
+              rect_pad_width: 5,
+              rect_pad_height: 3,
+              rect_ccw_rotation: 0,
+              pcb_component_id: "pcb_component_1002",
+              pcb_plated_hole_id: "pcb_plated_hole_1002",
+            },
+          ] as any
+        }
+      />
+    </div>
+  )
+}
+
+export default PlatedHoleRotatedPillWithRectPad

src/lib/Drawer.ts

@@ -286,6 +286,29 @@ export class Drawer {
     ctx.restore()
   }
 
+  rotatedPill(
+    x: number,
+    y: number,
+    w: number,
+    h: number,
+    ccw_rotation: Rotation,
+  ) {
+    const ctx = this.getLayerCtx()
+    this.applyAperture()
+
+    ctx.save()
+
+    const [centerX, centerY] = applyToPoint(this.transform, [x, y])
+    ctx.translate(centerX, centerY)
+    const cw_rotation = 360 - ccw_rotation
+    if (ccw_rotation) ctx.rotate((cw_rotation * Math.PI) / 180)
+    ctx.translate(-centerX, -centerY)
+
+    this.pill(x, y, w, h)
+
+    ctx.restore()
+  }
+
   circle(x: number, y: number, r: number, mesh_fill?: boolean) {
     const r$ = scaleOnly(this.transform, r)
     const [x$, y$] = applyToPoint(this.transform, [x, y])

src/lib/convert-element-to-primitive.ts

@@ -138,6 +138,7 @@ export const convertElementToPrimitives = (
             _parent_pcb_component,
             _parent_source_component,
             _source_port,
+            ccw_rotation: (element as any).ccw_rotation,
           },
         ]
       } else if (element.shape === "circle") {
@@ -333,6 +334,45 @@ export const convertElementToPrimitives = (
             layer: "drill", // Pill-shaped hole in drill layer
           },
         ]
+      } else if (element.shape === "rotated_pill_hole_with_rect_pad") {
+        const {
+          x,
+          y,
+          hole_width,
+          hole_height,
+          hole_ccw_rotation,
+          rect_pad_width,
+          rect_pad_height,
+          rect_ccw_rotation,
+        } = element as any // Use as any to access new properties
+
+        return [
+          {
+            _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+            pcb_drawing_type: "rect",
+            x,
+            y,
+            w: rect_pad_width,
+            h: rect_pad_height,
+            layer: "top", // Rectangular pad on top layer
+            _element: element,
+            _parent_pcb_component,
+            _parent_source_component,
+            _source_port,
+            ccw_rotation: rect_ccw_rotation,
+          },
+          {
+            _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+            _element: element,
+            pcb_drawing_type: "pill",
+            x,
+            y,
+            w: hole_width,
+            h: hole_height,
+            layer: "drill", // Pill-shaped hole in drill layer
+            ccw_rotation: hole_ccw_rotation,
+          },
+        ]
       } else {
         return []
       }

src/lib/draw-primitives.ts

@@ -157,16 +157,21 @@ export const drawRect = (drawer: Drawer, rect: Rect) => {
   })
 }
 
-export const drawRotatedRect = (
-  drawer: Drawer,
-  rect: Rect & { ccw_rotation: Rotation },
-) => {
+export const drawRotatedRect = (drawer: Drawer, rect: Rect) => {
   drawer.equip({
     color: getColor(rect),
     layer: rect.layer,
   })
 
-  drawer.rotatedRect(rect.x, rect.y, rect.w, rect.h, rect.ccw_rotation)
+  drawer.rotatedRect(rect.x, rect.y, rect.w, rect.h, rect.ccw_rotation!)
+}
+
+export const drawRotatedPill = (drawer: Drawer, pill: Pill) => {
+  drawer.equip({
+    color: getColor(pill),
+    layer: pill.layer,
+  })
+  drawer.rotatedPill(pill.x, pill.y, pill.w, pill.h, pill.ccw_rotation!)
 }
 
 export const drawCircle = (drawer: Drawer, circle: Circle) => {
@@ -208,21 +213,18 @@ export const drawPrimitive = (drawer: Drawer, primitive: Primitive) => {
     case "text":
       return drawText(drawer, primitive)
     case "rect":
-      // @ts-ignore
-      if (primitive._element?.shape === "rotated_rect") {
-        return drawRotatedRect(drawer, {
-          ...primitive,
-          // @ts-ignore
-          ccw_rotation: primitive._element.ccw_rotation,
-          mesh_fill: primitive.mesh_fill,
-        })
+      if (primitive.ccw_rotation) {
+        return drawRotatedRect(drawer, primitive)
       }
       return drawRect(drawer, primitive)
     case "circle":
       return drawCircle(drawer, primitive)
     case "oval":
       return drawOval(drawer, primitive)
     case "pill":
+      if (primitive.ccw_rotation) {
+        return drawRotatedPill(drawer, primitive)
+      }
       return drawPill(drawer, primitive)
     case "polygon":
       return drawPolygon(drawer, primitive)

src/lib/types.ts

@@ -61,6 +61,7 @@ export interface Rect extends PCBDrawingObject {
   is_filled?: boolean
   has_stroke?: boolean
   is_stroke_dashed?: boolean
+  ccw_rotation?: number
 }
 
 export interface Circle extends PCBDrawingObject {
@@ -85,6 +86,7 @@ export interface Pill extends PCBDrawingObject {
   y: number
   w: number
   h: number
+  ccw_rotation?: number
 }
 
 export interface Polygon extends PCBDrawingObject {