@tscircuit/pcb-viewer 1.3.13 → 1.4.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 tscircuit
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -6,6 +6,8 @@
 
 Render PCBs w/ React
 
+![image](https://github.com/tscircuit/pcb-viewer/assets/1910070/e010f44e-b8c0-4e1d-9d59-1ea66716427f)
+
 ## Usage
 
 ```

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { LayerRef, AnySoupElement } from '@tscircuit/builder';
+import { LayerRef } from '@tscircuit/builder';
+import { AnySoupElement } from '@tscircuit/soup';
 import { Matrix } from 'transformation-matrix';
 
 type EditComponentLocationEvent = {

package/dist/index.js

@@ -976,6 +976,18 @@ var drawCircle = function(drawer, circle) {
     });
     drawer.circle(circle.x, circle.y, circle.r);
 };
+var drawOval = function(drawer, oval) {
+    drawer.equip({
+        color: oval.layer
+    });
+    drawer.oval(oval.x, oval.y, oval.rX, oval.rY);
+};
+var drawPill = function(drawer, pill) {
+    drawer.equip({
+        color: pill.layer
+    });
+    drawer.pill(pill.x, pill.y, pill.w, pill.h);
+};
 var drawPrimitive = function(drawer, primitive) {
     switch(primitive.pcb_drawing_type){
         case "line":
@@ -986,8 +998,11 @@ var drawPrimitive = function(drawer, primitive) {
             return drawRect(drawer, primitive);
         case "circle":
             return drawCircle(drawer, primitive);
+        case "oval":
+            return drawOval(drawer, primitive);
+        case "pill":
+            return drawPill(drawer, primitive);
     }
-    throw new Error("Unknown primitive type: ".concat(primitive.pcb_drawing_type));
 };
 var drawPrimitives = function(drawer, primitives) {
     primitives.sort(function(a, b) {
@@ -1372,6 +1387,44 @@ var Drawer = /*#__PURE__*/ function() {
                 ctx.closePath();
             }
         },
+        {
+            key: "oval",
+            value: function oval(x, y, rx, ry) {
+                var rx$ = scaleOnly(this.transform, rx);
+                var ry$ = scaleOnly(this.transform, ry);
+                var _ref = _sliced_to_array((0, import_transformation_matrix.applyToPoint)(this.transform, [
+                    x,
+                    y
+                ]), 2), x$ = _ref[0], y$ = _ref[1];
+                this.applyAperture();
+                var ctx = this.getLayerCtx();
+                ctx.beginPath();
+                ctx.ellipse(x$, y$, rx$, ry$, 0, 0, 2 * Math.PI);
+                ctx.fill();
+                ctx.closePath();
+            }
+        },
+        {
+            key: "pill",
+            value: function pill(x, y, w, h) {
+                var _ref = _sliced_to_array((0, import_transformation_matrix.applyToPoint)(this.transform, [
+                    x - w / 2,
+                    y + h / 2
+                ]), 2), x$ = _ref[0], y$ = _ref[1];
+                var width$ = scaleOnly(this.transform, w);
+                var height$ = scaleOnly(this.transform, h);
+                var radius = Math.min(width$, height$) / 2;
+                this.applyAperture();
+                var ctx = this.getLayerCtx();
+                ctx.beginPath();
+                ctx.arc(x$ + radius, y$ + radius, radius, Math.PI, Math.PI * 1.5);
+                ctx.arc(x$ + width$ - radius, y$ + radius, radius, Math.PI * 1.5, 0);
+                ctx.arc(x$ + width$ - radius, y$ + height$ - radius, radius, 0, Math.PI * 0.5);
+                ctx.arc(x$ + radius, y$ + height$ - radius, radius, Math.PI * 0.5, Math.PI);
+                ctx.fill();
+                ctx.closePath();
+            }
+        },
         {
             /* NOTE: This is not gerber compatible */ key: "debugText",
             value: function debugText(text, x, y) {
@@ -1725,48 +1778,81 @@ var convertElementToPrimitives = function(element, allElements) {
                         }
                     ];
                 }
+                return [];
             }
         case "pcb_hole":
             {
-                var x2 = element.x, y2 = element.y, hole_diameter = element.hole_diameter;
-                return [
-                    {
-                        pcb_drawing_type: "circle",
-                        x: x2,
-                        y: y2,
-                        r: hole_diameter / 2,
-                        layer: "drill",
-                        _element: element,
-                        _parent_pcb_component: _parent_pcb_component,
-                        _parent_source_component: _parent_source_component
-                    }
-                ];
+                if (element.hole_shape === "round" || !element.hole_shape) {
+                    var x2 = element.x, y2 = element.y, hole_diameter = element.hole_diameter;
+                    return [
+                        {
+                            pcb_drawing_type: "circle",
+                            x: x2,
+                            y: y2,
+                            r: hole_diameter / 2,
+                            layer: "drill",
+                            _element: element,
+                            _parent_pcb_component: _parent_pcb_component,
+                            _parent_source_component: _parent_source_component
+                        }
+                    ];
+                }
+                return [];
             }
         case "pcb_plated_hole":
             {
-                var x3 = element.x, y3 = element.y, hole_diameter1 = element.hole_diameter, outer_diameter = element.outer_diameter;
-                return [
-                    {
-                        pcb_drawing_type: "circle",
-                        x: x3,
-                        y: y3,
-                        r: outer_diameter / 2,
-                        // TODO support layer on pcb_plated_hole
-                        layer: "top",
-                        _element: element,
-                        _parent_pcb_component: _parent_pcb_component,
-                        _parent_source_component: _parent_source_component,
-                        _source_port: _source_port
-                    },
-                    {
-                        pcb_drawing_type: "circle",
-                        x: x3,
-                        y: y3,
-                        r: hole_diameter1 / 2,
-                        // TODO support layer on pcb_plated_hole
-                        layer: "drill"
-                    }
-                ];
+                if (element.shape === "circle") {
+                    var x3 = element.x, y3 = element.y, hole_diameter1 = element.hole_diameter, outer_diameter = element.outer_diameter;
+                    return [
+                        {
+                            pcb_drawing_type: "circle",
+                            x: x3,
+                            y: y3,
+                            r: outer_diameter / 2,
+                            // TODO support layer on pcb_plated_hole
+                            layer: "top",
+                            _element: element,
+                            _parent_pcb_component: _parent_pcb_component,
+                            _parent_source_component: _parent_source_component,
+                            _source_port: _source_port
+                        },
+                        {
+                            pcb_drawing_type: "circle",
+                            x: x3,
+                            y: y3,
+                            r: hole_diameter1 / 2,
+                            // TODO support layer on pcb_plated_hole
+                            layer: "drill"
+                        }
+                    ];
+                } else if (element.shape === "oval") {
+                    var x4 = element.x, y4 = element.y, outer_height = element.outer_height, outer_width = element.outer_width, hole_height = element.hole_height, hole_width = element.hole_width, layers = element.layers;
+                    return [
+                        {
+                            pcb_drawing_type: "oval",
+                            x: x4,
+                            y: y4,
+                            rX: outer_width / 2,
+                            rY: outer_height / 2,
+                            layer: "top",
+                            // TODO: Confirm layer handling for oval plated holes
+                            _element: element,
+                            _parent_pcb_component: _parent_pcb_component,
+                            _parent_source_component: _parent_source_component,
+                            _source_port: _source_port
+                        },
+                        {
+                            pcb_drawing_type: "oval",
+                            x: x4,
+                            y: y4,
+                            rX: hole_width / 2,
+                            rY: hole_height / 2,
+                            layer: "drill"
+                        }
+                    ];
+                } else {
+                    return [];
+                }
             }
         case "pcb_trace":
             {
@@ -1812,12 +1898,12 @@ var convertElementToPrimitives = function(element, allElements) {
             }
         case "pcb_via":
             {
-                var x4 = element.x, y4 = element.y, outer_diameter1 = element.outer_diameter, hole_diameter2 = element.hole_diameter, from_layer = element.from_layer, to_layer = element.to_layer;
+                var x5 = element.x, y5 = element.y, outer_diameter1 = element.outer_diameter, hole_diameter2 = element.hole_diameter, from_layer = element.from_layer, to_layer = element.to_layer;
                 return [
                     {
                         pcb_drawing_type: "circle",
-                        x: x4,
-                        y: y4,
+                        x: x5,
+                        y: y5,
                         r: outer_diameter1 / 2,
                         layer: from_layer,
                         _element: element,
@@ -1826,8 +1912,8 @@ var convertElementToPrimitives = function(element, allElements) {
                     },
                     {
                         pcb_drawing_type: "circle",
-                        x: x4,
-                        y: y4,
+                        x: x5,
+                        y: y5,
                         r: hole_diameter2 / 2,
                         layer: "drill",
                         _element: element,
@@ -1836,8 +1922,8 @@ var convertElementToPrimitives = function(element, allElements) {
                     },
                     {
                         pcb_drawing_type: "circle",
-                        x: x4,
-                        y: y4,
+                        x: x5,
+                        y: y5,
                         r: outer_diameter1 / 2,
                         layer: to_layer,
                         _element: element,
@@ -1871,6 +1957,32 @@ var convertElementToPrimitives = function(element, allElements) {
                     }
                 ];
             }
+        case "pcb_silkscreen_oval":
+            {
+                return [
+                    {
+                        pcb_drawing_type: "oval",
+                        x: element.center.x,
+                        y: element.center.y,
+                        rX: element.radius_x / 2,
+                        rY: element.radius_y / 2,
+                        layer: element.layer === "bottom" ? "bottom_silkscreen" : "top_silkscreen"
+                    }
+                ];
+            }
+        case "pcb_silkscreen_pill":
+            {
+                return [
+                    {
+                        pcb_drawing_type: "pill",
+                        x: element.center.x,
+                        y: element.center.y,
+                        w: element.width,
+                        h: element.height,
+                        layer: element.layer === "bottom" ? "bottom_silkscreen" : "top_silkscreen"
+                    }
+                ];
+            }
         case "pcb_silkscreen_line":
             {
                 return [
@@ -2440,7 +2552,7 @@ var import_builder2 = require("@tscircuit/builder");
 // package.json
 var package_default = {
     name: "@tscircuit/pcb-viewer",
-    version: "1.3.12",
+    version: "1.3.14",
     main: "dist/index.js",
     repository: "tscircuit/pcb-viewer",
     license: "MIT",
@@ -2463,11 +2575,11 @@ var package_default = {
         "@storybook/nextjs": "^8.0.6",
         "@storybook/react": "^8.0.6",
         "@swc/core": "^1.4.12",
-        "@tscircuit/builder": "^1.5.114",
+        "@tscircuit/builder": "^1.5.117",
         "@tscircuit/eagle-xml-converter": "^0.0.6",
         "@tscircuit/props": "^0.0.7",
         "@tscircuit/react-fiber": "^1.1.25",
-        "@tscircuit/soup": "^0.0.32",
+        "@tscircuit/soup": "^0.0.33",
         "@types/node": "18.7.23",
         "@types/react": "^18.3.3",
         next: "^14.1.4",
@@ -3527,7 +3639,7 @@ var PCBViewer = function(param) {
             height: 1e-3
         }, center = _ref.center, width = _ref.width, height2 = _ref.height;
         var _elmBounds_width, _elmBounds_height;
-        var scaleFactor = Math.min(((_elmBounds_width = elmBounds.width) !== null && _elmBounds_width !== void 0 ? _elmBounds_width : 0) / width, ((_elmBounds_height = elmBounds.height) !== null && _elmBounds_height !== void 0 ? _elmBounds_height : 0) / height2, 100);
+        var scaleFactor = Math.min(((_elmBounds_width = elmBounds.width) !== null && _elmBounds_width !== void 0 ? _elmBounds_width : 0) / width, ((_elmBounds_height = elmBounds.height) !== null && _elmBounds_height !== void 0 ? _elmBounds_height : 0) / height2, 100) * 0.75;
         var _elmBounds_width1, _elmBounds_height1;
         setTransform((0, import_transformation_matrix8.compose)((0, import_transformation_matrix8.translate)(((_elmBounds_width1 = elmBounds.width) !== null && _elmBounds_width1 !== void 0 ? _elmBounds_width1 : 0) / 2, ((_elmBounds_height1 = elmBounds.height) !== null && _elmBounds_height1 !== void 0 ? _elmBounds_height1 : 0) / 2), // translate(100, 0),
         (0, import_transformation_matrix8.scale)(scaleFactor, -scaleFactor, 0, 0), (0, import_transformation_matrix8.translate)(-center.x, -center.y)));