Fix/dxf scale (#2528)

* Feature: Change version tag * Fix: Remove log info
Snapmaker · Nov 13, 2024 · e44dd39 · e44dd39
1 parent 2a7bff2
commit e44dd39
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "snapmaker-luban",
-  "version": "4.13.1-beta.1.2",
+  "version": "4.13.1-beta.1.3",
   "description": "A web-based interface for Snapmaker 3-in-1 3D Printer",
   "homepage": "https://github.com/Snapmaker/Luban",
   "author": "Snapmaker Software Team",

diff --git a/src/app/flux/editor/index.ts b/src/app/flux/editor/index.ts
@@ -812,14 +812,20 @@ export const actions = {
         } else {
             const extname = path.extname(uploadName);
             const isScale = !includes(scaleExtname, extname);
-
-            const newModelSize = sourceType !== SOURCE_TYPE.IMAGE3D
-                ? limitModelSizeByMachineSize(coordinateSize, sourceWidth, sourceHeight, isLimit, isScale)
-                : sizeModel(size, materials, sourceWidth, sourceHeight);
-
-            width = newModelSize?.width;
-            height = newModelSize?.height;
-            scale = newModelSize?.scale;
+            const originalExtname = path.extname(originalName).toLowerCase();
+            if (originalExtname !== '.dxf') {
+                const newModelSize = sourceType !== SOURCE_TYPE.IMAGE3D && sourceType !== SOURCE_TYPE.SVG
+                    ? limitModelSizeByMachineSize(coordinateSize, sourceWidth, sourceHeight, isLimit, isScale)
+                    : sizeModel(size, materials, sourceWidth, sourceHeight);
+
+                width = newModelSize?.width;
+                height = newModelSize?.height;
+                scale = newModelSize?.scale;
+            } else {
+                width = sourceWidth;
+                height = sourceHeight;
+                scale = 1;
+            }
         }
 
         if (`${headType}-${sourceType}-${mode}` === 'cnc-raster-greyscale') {