FIX: dxf export results in error with newer cadquery versions #12

Author: drayde

cadscript/export.py

@@ -2,60 +2,33 @@
 # This file is part of Cadscript
 # SPDX-License-Identifier: Apache-2.0
 
-import ezdxf
 import cadquery as cq
+
 from typing import Optional, Literal
 
 
 def export_sketch_DXF(
     s: cq.Sketch,
     fname: str,
     approx: Optional[Literal["spline", "arc"]] = None,
-    tolerance: float = 1e-3,
+    tolerance: float = 1e-3    
 ):
     """
     Export Sketch content to DXF. Works with 2D sections.
 
     :param s: Sketch to be exported.
     :param fname: Output filename.
     :param approx: Approximation strategy. None means no approximation is applied.
-    "spline" results in all splines being approximated as cubic splines. "arc" results
-    in all curves being approximated as arcs and straight segments.
+        "spline" results in all splines being approximated as cubic splines. "arc" results
+        in all curves being approximated as arcs and straight segments.
     :param tolerance: Approximation tolerance.
 
+    Remark: uses mm as unit.
     """
-    w = cq.Workplane().placeSketch(s)
-    plane = w.plane
-
-    dxf = ezdxf.new()
-    dxf.units = ezdxf.units.MM
-    msp = dxf.modelspace()
-
-    for f in s.faces():
-
-        shape = f.transformShape(plane.fG)
-
-        if approx == "spline":
-            edges = [
-                e.toSplines() if e.geomType() == "BSPLINE" else e for e in shape.Edges()
-            ]
-
-        elif approx == "arc":
-            edges = []
-
-            # this is needed to handle free wires
-            for el in shape.Wires():
-                edges.extend(cq.Face.makeFromWires(el).toArcs(tolerance).Edges())
-
-        else:
-            edges = shape.Edges()
-
-        for e in edges:
+    w = cq.Workplane().add(s._faces)  # see https://github.com/CadQuery/cadquery/issues/1575
+    cq.exporters.dxf.exportDXF(w, fname, approx=approx, tolerance=tolerance)
 
-            conv = cq.exporters.dxf.DXF_CONVERTERS.get(e.geomType(), cq.exporters.dxf._dxf_spline)
-            conv(e, msp, plane)
 
-    dxf.saveas(fname)
 
 
 def export_svg(part, filename, width=300, height=300, strokeWidth=0.6, projectionDir=(1, 1, 1)):

tests/test_dxf.py

@@ -0,0 +1,37 @@
+# Copyright (C) 2023-2024 Andreas Kahler
+# This file is part of Cadscript
+# SPDX-License-Identifier: Apache-2.0
+
+from pathlib import Path
+import tempfile
+import time
+import unittest
+import cadscript
+
+
+class DxfTest(unittest.TestCase):
+
+    def test_export_dxf_reimport(self):
+        # Create a simple sketch
+        s = cadscript.make_sketch()
+        s.add_rect(10, 20)
+        # export to temp file, use library to create unique filename
+        temp_dir = Path(tempfile.gettempdir())
+        temp_path = str(temp_dir / f"cadscript_{time.time()}.dxf")
+
+        s.export_dxf(temp_path)
+
+        # test if file exists
+        self.assertTrue(Path(temp_path).exists())
+
+        # reimport
+        s2 = cadscript.make_sketch()
+        s2.add_import_dxf(temp_path)
+
+        # test if reimported sketch has same extents
+        self.assertEqual(s.get_extent(), s2.get_extent())
+
+
+
+if __name__ == '__main__':
+    unittest.main()