Fix import scale issue for gerbers using imperial units (#17)

* Fix import scale issue for gerbers using imperial units * Remove logging. Fix .gitignore * Update package version to 1.3.1 --------- Co-authored-by: errol t <[email protected]>
Andrew-Dickinson · Mar 19, 2024 · 7e30439 · 7e30439
1 parent a34d4c5
commit 7e30439
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ yarn-debug.log*
 yarn-error.log*
 
 .tpm/
+.tmp/
 
 # Developer tools' files
 .lite_workspace.lua

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "photonic-etcher",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Generate exposure masks for Anycubic printers from PCB Gerbers",
   "homepage": ".",
   "bugs": {

diff --git a/src/renderer/render-to-photon.ts b/src/renderer/render-to-photon.ts
@@ -36,8 +36,19 @@ const {CanvasToImage} = require("./canvas_to_img");
 
     for (const layer of layers) {
         const svgXMLObj = parser.parse(layer.svg);
-        const board_width_mm = parseFloat(svgXMLObj.svg['@_width'].replace("mm", ""));
-        const board_height_mm = parseFloat(svgXMLObj.svg['@_height'].replace("mm", ""));
+        var board_width_mm;
+        var board_height_mm;
+        if(svgXMLObj.svg['@_width'].endsWith('in'))
+        {
+            board_width_mm = parseFloat(svgXMLObj.svg['@_width'].replace("in", ""))*25.4;
+            board_height_mm = parseFloat(svgXMLObj.svg['@_height'].replace("in", ""))*25.4;
+        }
+        else
+        {
+            board_width_mm = parseFloat(svgXMLObj.svg['@_width'].replace("mm", ""));
+            board_height_mm = parseFloat(svgXMLObj.svg['@_height'].replace("mm", ""));
+        }
+
         const viewbox = svgXMLObj.svg['@_viewBox'].split(' ').map((str) => parseInt(str));
         const exposureTime = options.exposureTimes[layer.id];
         let outputFileName = ""