mirrors/build123d
1
Fork 0
mirror of https://github.com/gumyr/build123d.git synced 2025-12-15 15:20:37 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: allow mesher to read/write from pathlike things

Browse source
This commit is contained in:
Ethan Rooke 2024-11-14 21:48:46 -06:00
parent 69cdabcc72
commit cada1d4239
No known key found for this signature in database
GPG key ID: B2874A77049A5923
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/build123d/exporters.py
View file

@ -649,7 +649,7 @@ class ExportDXF(Export2D):
# https://github.com/gumyr/build123d/issues/382 tracks
# exposing viewport control to the user.
zoom.extents(self._modelspace)
self._document.saveas(file_name)
self._document.saveas(fsdecode(file_name))
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

35
src/build123d/mesher.py
View file

@ -88,8 +88,10 @@ import os
import sys
import uuid
import warnings
from os import PathLike, fsdecode
from typing import Iterable, Union
import OCP.TopAbs as ta
from OCP.BRep import BRep_Tool
from OCP.BRepBuilderAPI import (
BRepBuilderAPI_MakeFace,
@ -100,16 +102,15 @@ from OCP.BRepBuilderAPI import (
from OCP.BRepGProp import BRepGProp
from OCP.BRepMesh import BRepMesh_IncrementalMesh
from OCP.gp import gp_Pnt
import OCP.TopAbs as ta
from OCP.GProp import GProp_GProps
from OCP.TopAbs import TopAbs_ShapeEnum
from OCP.TopExp import TopExp_Explorer
from OCP.TopoDS import TopoDS_Compound
from OCP.TopLoc import TopLoc_Location
from OCP.TopoDS import TopoDS_Compound
from py_lib3mf import Lib3MF
from build123d.build_enums import MeshType, Unit
from build123d.geometry import Color, TOLERANCE
from build123d.geometry import TOLERANCE, Color
from build123d.topology import Compound, Shape, Shell, Solid, downcast
@ -482,11 +483,11 @@ class Mesher:
return shape_obj
def read(self, file_name: str) -> list[Shape]:
def read(self, file_name: Union[PathLike, str, bytes]) -> list[Shape]:
"""read
Args:
file_name (str): file path
file_name Union[PathLike, str, bytes]: file path
Raises:
ValueError: Unknown file format - must be 3mf or stl
@ -494,10 +495,11 @@ class Mesher:
Returns:
list[Shape]: build123d shapes extracted from mesh file
"""
input_file_format = file_name.split(".")[-1].lower()
if input_file_format not in ["3mf", "stl"]:
raise ValueError(f"Unknown file format {input_file_format}")
reader = self.model.QueryReader(input_file_format)
file_name = fsdecode(file_name)
_, input_file_extension = os.path.splitext(file_name)
if input_file_extension not in [".3mf", ".stl"]:
raise ValueError(f"Unknown file format {input_file_extension}")
reader = self.model.QueryReader(input_file_extension[1:])
reader.ReadFromFile(file_name)
self.unit = Mesher._map_3mf_to_b3d_unit[self.model.GetUnit()]
@ -525,17 +527,18 @@ class Mesher:
return shapes
def write(self, file_name: str):
def write(self, file_name: Union[PathLike, str, bytes]):
"""write
Args:
file_name (str): file path
file_name Union[Pathlike, str, bytes]: file path
Raises:
ValueError: Unknown file format - must be 3mf or stl
"""
output_file_format = file_name.split(".")[-1].lower()
if output_file_format not in ["3mf", "stl"]:
raise ValueError(f"Unknown file format {output_file_format}")
writer = self.model.QueryWriter(output_file_format)
file_name = fsdecode(file_name)
_, output_file_extension = os.path.splitext(file_name)
if output_file_extension not in [".3mf", ".stl"]:
raise ValueError(f"Unknown file format {output_file_extension}")
writer = self.model.QueryWriter(output_file_extension[1:])
writer.WriteToFile(file_name)