Use FCStd class for jcad to freecad conversion

Author: Yahiewi

jupytercad_freecad/freecad/jcad_converter.py

@@ -1,10 +1,38 @@
 import freecad as fc
+import base64
+import tempfile
+from .loader import FCStd
+import os
+
 
 def convert_jcad_to_fcstd(jcad_dict: dict) -> 'fc.Document':
-    """
-    Stub converter: create an empty FreeCAD document.
-    Later, fill this in by iterating jcad_dict["objects"] and applying ops.
-    """
-    doc = fc.app.newDocument("FromJCAD")
-    # TODO: recreate primitives & boolean ops here
-    return doc
+    # 1) Spin up a brand‑new FreeCAD doc and write it out to a temp .FCStd
+    blank = fc.app.newDocument("__jcad_blank__")
+    blank.recompute()  # ensure it's fully initialized
+    with tempfile.NamedTemporaryFile(delete=False, suffix=".FCStd") as tmp_blank:
+        blank.saveAs(tmp_blank.name)
+        tmp_blank.flush()
+    fc.app.closeDocument(blank.Name)
+
+    # 2) Read its bytes, encode as base64, give to FCStd loader
+    with open(tmp_blank.name, "rb") as f:
+        b64_blank = base64.b64encode(f.read()).decode("utf-8")
+    os.remove(tmp_blank.name)
+
+    fcstd = FCStd()
+    fcstd._sources = b64_blank
+
+    # 3) Replay your JCAD model into it
+    objs     = jcad_dict.get("objects", [])
+    opts     = jcad_dict.get("options", {})
+    meta     = jcad_dict.get("metadata", {})
+    fcstd.save(objs, opts, meta)
+
+    # 4) Dump the new .FCStd and re‑open it
+    with tempfile.NamedTemporaryFile(delete=False, suffix=".FCStd") as tmp_out:
+        tmp_out.write(base64.b64decode(fcstd.sources))
+        tmp_out.flush()
+
+    doc = fc.app.openDocument(tmp_out.name)
+    return doc
+

jupytercad_freecad/handlers.py

@@ -7,7 +7,7 @@
 import tornado
 
 from jupytercad_freecad.freecad.loader import FCStd
-
+from jupytercad_freecad.freecad.jcad_converter import convert_jcad_to_fcstd
 
 class BackendCheckHandler(APIHandler):
     @tornado.web.authenticated
@@ -85,6 +85,40 @@ def post(self):
         self.finish(json.dumps({"done": True, "exportedPath": str(export_path)}))
 
 
+class FCStdExportHandler(APIHandler):
+    @tornado.web.authenticated
+    def post(self):
+        body = self.get_json_body()
+
+        # same path‐splitting logic as JCadExportHandler
+        path = body.get("path", "")
+        parts = path.split(":", 1)
+        file_name = parts[1] if len(parts) == 2 else parts[0]
+
+        new_name = body["newName"]
+        root_dir = Path(self.contents_manager.root_dir).resolve()
+        in_path = Path(to_os_path(ApiPath(file_name), str(root_dir)))
+        out_path = in_path.parent / new_name
+
+        # load JCAD JSON from disk
+        try:
+            jcad_dict = json.loads(in_path.read_text())
+        except Exception as e:
+            self.log.error(f"Error reading JCAD file {in_path}: {e}")
+            self.set_status(500)
+            return self.finish(json.dumps({"error": str(e)}))
+
+        # convert to FreeCAD document
+        try:
+            doc = convert_jcad_to_fcstd(jcad_dict)
+            doc.saveAs(str(out_path))  # write .FCStd
+        except Exception as e:
+            self.log.error(f"Conversion to FCStd failed: {e}")
+            self.set_status(500)
+            return self.finish(json.dumps({"error": str(e)}))
+
+        self.finish(json.dumps({"done": True, "exportedPath": str(out_path)}))
+
 def setup_handlers(web_app):
     host_pattern = ".*$"
 
@@ -98,6 +132,10 @@ def setup_handlers(web_app):
         (
             url_path_join(base_url, "jupytercad_freecad", "export-jcad"),
             JCadExportHandler,
+        ),
+                (
+            url_path_join(base_url, "jupytercad_freecad", "export-fcstd"),
+            FCStdExportHandler,
         ),
     ]
     web_app.add_handlers(host_pattern, handlers)